Mercurial Repositories > eric / changeset

--- a/WebBrowser/WebBrowserView.py	Tue Apr 24 19:11:08 2018 +0200
+++ b/WebBrowser/WebBrowserView.py	Tue Apr 24 19:12:10 2018 +0200
@@ -136,7 +136,8 @@
         if qVersionTuple() >= (5, 8, 0):
             if self.parentWidget() is not None:
                 self.parentWidget().installEventFilter(self)
-            
+        
+        if qVersionTuple() >= (5, 8, 0) and qVersionTuple() < (5, 11, 0):
             lay = self.layout()
             lay.currentChanged.connect(
                 lambda: QTimer.singleShot(0, self.__setRwhvqt))
@@ -1499,6 +1500,10 @@
         @return flag indicating that the event should be filtered out
         @rtype bool
         """
+        if obj is self and evt.type() == QEvent.ParentChange and \
+           self.parentWidget() is not None:
+            self.parentWidget().installEventFilter(self)
+        
         # find the render widget receiving events for the web page
         if qVersionTuple() < (5, 8, 0):
             if obj is self and evt.type() == QEvent.ChildAdded:
@@ -1510,10 +1515,9 @@
                     self.grabGesture(Qt.PinchGesture)
                     self.__rwhvqt.grabGesture(Qt.PinchGesture)
                     self.__rwhvqt.installEventFilter(self)
-        else:
-            if obj is self and evt.type() == QEvent.ParentChange and \
-               self.parentWidget() is not None:
-                self.parentWidget().installEventFilter(self)
+        elif qVersionTuple() >= (5, 11, 0):
+            if obj is self and evt.type() == QEvent.ChildAdded:
+                QTimer.singleShot(0, self.__setRwhvqt)
         
         # forward events to WebBrowserView
         if obj is self.__rwhvqt and \