WebBrowserPage: Reverted the Qt 5.10.x workaround because the load progress is not reported reliably by Qt.

Thu, 08 Mar 2018 18:51:35 +0100

author
Detlev Offenbach <detlev@die-offenbachs.de>
date
Thu, 08 Mar 2018 18:51:35 +0100
changeset 6176
8927e74527bc
parent 6175
330ffed830a4
child 6177
af76e795c4ce

WebBrowserPage: Reverted the Qt 5.10.x workaround because the load progress is not reported reliably by Qt.

APIs/Python3/eric6.api file | annotate | diff | comparison | revisions
Documentation/Help/source.qch file | annotate | diff | comparison | revisions
Documentation/Help/source.qhp file | annotate | diff | comparison | revisions
Documentation/Source/eric6.Helpviewer.GreaseMonkey.GreaseMonkeyManager.html file | annotate | diff | comparison | revisions
Documentation/Source/eric6.Helpviewer.HelpBrowserWV.html file | annotate | diff | comparison | revisions
Documentation/Source/eric6.Helpviewer.HelpTabWidget.html file | annotate | diff | comparison | revisions
Documentation/Source/eric6.Helpviewer.HelpWebSearchWidget.html file | annotate | diff | comparison | revisions
Documentation/Source/eric6.WebBrowser.WebBrowserPage.html file | annotate | diff | comparison | revisions
Documentation/Source/eric6.WebBrowser.WebBrowserWebSearchWidget.html file | annotate | diff | comparison | revisions
WebBrowser/WebBrowserPage.py file | annotate | diff | comparison | revisions
--- a/APIs/Python3/eric6.api	Sun Mar 04 14:52:46 2018 +0100
+++ b/APIs/Python3/eric6.api	Thu Mar 08 18:51:35 2018 +0100
@@ -2391,7 +2391,7 @@
 eric6.Helpviewer.GreaseMonkey.GreaseMonkeyManager.GreaseMonkeyManager.disableScript?4(script)
 eric6.Helpviewer.GreaseMonkey.GreaseMonkeyManager.GreaseMonkeyManager.downloadScript?4(request)
 eric6.Helpviewer.GreaseMonkey.GreaseMonkeyManager.GreaseMonkeyManager.enableScript?4(script)
-eric6.Helpviewer.GreaseMonkey.GreaseMonkeyManager.GreaseMonkeyManager.pageLoadStarted?4(frame)
+eric6.Helpviewer.GreaseMonkey.GreaseMonkeyManager.GreaseMonkeyManager.pageLoadStarted?4()
 eric6.Helpviewer.GreaseMonkey.GreaseMonkeyManager.GreaseMonkeyManager.removeScript?4(script)
 eric6.Helpviewer.GreaseMonkey.GreaseMonkeyManager.GreaseMonkeyManager.requireScripts?4(urlList)
 eric6.Helpviewer.GreaseMonkey.GreaseMonkeyManager.GreaseMonkeyManager.requireScriptsDirectory?4()
Binary file Documentation/Help/source.qch has changed
--- a/Documentation/Help/source.qhp	Sun Mar 04 14:52:46 2018 +0100
+++ b/Documentation/Help/source.qhp	Thu Mar 08 18:51:35 2018 +0100
@@ -7871,13 +7871,12 @@
       <keyword name="HelpWebSearchWidget" id="HelpWebSearchWidget" ref="eric6.Helpviewer.HelpWebSearchWidget.html#HelpWebSearchWidget" />
       <keyword name="HelpWebSearchWidget (Constructor)" id="HelpWebSearchWidget (Constructor)" ref="eric6.Helpviewer.HelpWebSearchWidget.html#HelpWebSearchWidget.__init__" />
       <keyword name="HelpWebSearchWidget (Module)" id="HelpWebSearchWidget (Module)" ref="eric6.Helpviewer.HelpWebSearchWidget.html" />
-      <keyword name="HelpWebSearchWidget.__addEngineFromUrl" id="HelpWebSearchWidget.__addEngineFromUrl" ref="eric6.Helpviewer.HelpWebSearchWidget.html#HelpWebSearchWidget.__addEngineFromUrl" />
-      <keyword name="HelpWebSearchWidget.__changeCurrentEngine" id="HelpWebSearchWidget.__changeCurrentEngine" ref="eric6.Helpviewer.HelpWebSearchWidget.html#HelpWebSearchWidget.__changeCurrentEngine" />
       <keyword name="HelpWebSearchWidget.__completerActivated" id="HelpWebSearchWidget.__completerActivated" ref="eric6.Helpviewer.HelpWebSearchWidget.html#HelpWebSearchWidget.__completerActivated" />
       <keyword name="HelpWebSearchWidget.__completerHighlighted" id="HelpWebSearchWidget.__completerHighlighted" ref="eric6.Helpviewer.HelpWebSearchWidget.html#HelpWebSearchWidget.__completerHighlighted" />
       <keyword name="HelpWebSearchWidget.__currentEngineChanged" id="HelpWebSearchWidget.__currentEngineChanged" ref="eric6.Helpviewer.HelpWebSearchWidget.html#HelpWebSearchWidget.__currentEngineChanged" />
       <keyword name="HelpWebSearchWidget.__engineImageChanged" id="HelpWebSearchWidget.__engineImageChanged" ref="eric6.Helpviewer.HelpWebSearchWidget.html#HelpWebSearchWidget.__engineImageChanged" />
       <keyword name="HelpWebSearchWidget.__getSuggestions" id="HelpWebSearchWidget.__getSuggestions" ref="eric6.Helpviewer.HelpWebSearchWidget.html#HelpWebSearchWidget.__getSuggestions" />
+      <keyword name="HelpWebSearchWidget.__handleEnginesMenuActionTriggered" id="HelpWebSearchWidget.__handleEnginesMenuActionTriggered" ref="eric6.Helpviewer.HelpWebSearchWidget.html#HelpWebSearchWidget.__handleEnginesMenuActionTriggered" />
       <keyword name="HelpWebSearchWidget.__loadSearches" id="HelpWebSearchWidget.__loadSearches" ref="eric6.Helpviewer.HelpWebSearchWidget.html#HelpWebSearchWidget.__loadSearches" />
       <keyword name="HelpWebSearchWidget.__newSuggestions" id="HelpWebSearchWidget.__newSuggestions" ref="eric6.Helpviewer.HelpWebSearchWidget.html#HelpWebSearchWidget.__newSuggestions" />
       <keyword name="HelpWebSearchWidget.__searchButtonClicked" id="HelpWebSearchWidget.__searchButtonClicked" ref="eric6.Helpviewer.HelpWebSearchWidget.html#HelpWebSearchWidget.__searchButtonClicked" />
@@ -17543,7 +17542,6 @@
       <keyword name="WebBrowserPage (Module)" id="WebBrowserPage (Module)" ref="eric6.WebBrowser.WebBrowserPage.html" />
       <keyword name="WebBrowserPage.__featurePermissionRequested" id="WebBrowserPage.__featurePermissionRequested" ref="eric6.WebBrowser.WebBrowserPage.html#WebBrowserPage.__featurePermissionRequested" />
       <keyword name="WebBrowserPage.__fullScreenRequested" id="WebBrowserPage.__fullScreenRequested" ref="eric6.WebBrowser.WebBrowserPage.html#WebBrowserPage.__fullScreenRequested" />
-      <keyword name="WebBrowserPage.__loadProgressSlot" id="WebBrowserPage.__loadProgressSlot" ref="eric6.WebBrowser.WebBrowserPage.html#WebBrowserPage.__loadProgressSlot" />
       <keyword name="WebBrowserPage.__setupChannelTimeout" id="WebBrowserPage.__setupChannelTimeout" ref="eric6.WebBrowser.WebBrowserPage.html#WebBrowserPage.__setupChannelTimeout" />
       <keyword name="WebBrowserPage.__setupWebChannelForUrl" id="WebBrowserPage.__setupWebChannelForUrl" ref="eric6.WebBrowser.WebBrowserPage.html#WebBrowserPage.__setupWebChannelForUrl" />
       <keyword name="WebBrowserPage.__urlChanged" id="WebBrowserPage.__urlChanged" ref="eric6.WebBrowser.WebBrowserPage.html#WebBrowserPage.__urlChanged" />
@@ -17779,13 +17777,12 @@
       <keyword name="WebBrowserWebSearchWidget" id="WebBrowserWebSearchWidget" ref="eric6.WebBrowser.WebBrowserWebSearchWidget.html#WebBrowserWebSearchWidget" />
       <keyword name="WebBrowserWebSearchWidget (Constructor)" id="WebBrowserWebSearchWidget (Constructor)" ref="eric6.WebBrowser.WebBrowserWebSearchWidget.html#WebBrowserWebSearchWidget.__init__" />
       <keyword name="WebBrowserWebSearchWidget (Module)" id="WebBrowserWebSearchWidget (Module)" ref="eric6.WebBrowser.WebBrowserWebSearchWidget.html" />
-      <keyword name="WebBrowserWebSearchWidget.__addEngineFromUrl" id="WebBrowserWebSearchWidget.__addEngineFromUrl" ref="eric6.WebBrowser.WebBrowserWebSearchWidget.html#WebBrowserWebSearchWidget.__addEngineFromUrl" />
-      <keyword name="WebBrowserWebSearchWidget.__changeCurrentEngine" id="WebBrowserWebSearchWidget.__changeCurrentEngine" ref="eric6.WebBrowser.WebBrowserWebSearchWidget.html#WebBrowserWebSearchWidget.__changeCurrentEngine" />
       <keyword name="WebBrowserWebSearchWidget.__completerActivated" id="WebBrowserWebSearchWidget.__completerActivated" ref="eric6.WebBrowser.WebBrowserWebSearchWidget.html#WebBrowserWebSearchWidget.__completerActivated" />
       <keyword name="WebBrowserWebSearchWidget.__completerHighlighted" id="WebBrowserWebSearchWidget.__completerHighlighted" ref="eric6.WebBrowser.WebBrowserWebSearchWidget.html#WebBrowserWebSearchWidget.__completerHighlighted" />
       <keyword name="WebBrowserWebSearchWidget.__currentEngineChanged" id="WebBrowserWebSearchWidget.__currentEngineChanged" ref="eric6.WebBrowser.WebBrowserWebSearchWidget.html#WebBrowserWebSearchWidget.__currentEngineChanged" />
       <keyword name="WebBrowserWebSearchWidget.__engineImageChanged" id="WebBrowserWebSearchWidget.__engineImageChanged" ref="eric6.WebBrowser.WebBrowserWebSearchWidget.html#WebBrowserWebSearchWidget.__engineImageChanged" />
       <keyword name="WebBrowserWebSearchWidget.__getSuggestions" id="WebBrowserWebSearchWidget.__getSuggestions" ref="eric6.WebBrowser.WebBrowserWebSearchWidget.html#WebBrowserWebSearchWidget.__getSuggestions" />
+      <keyword name="WebBrowserWebSearchWidget.__handleEnginesMenuActionTriggered" id="WebBrowserWebSearchWidget.__handleEnginesMenuActionTriggered" ref="eric6.WebBrowser.WebBrowserWebSearchWidget.html#WebBrowserWebSearchWidget.__handleEnginesMenuActionTriggered" />
       <keyword name="WebBrowserWebSearchWidget.__loadSearches" id="WebBrowserWebSearchWidget.__loadSearches" ref="eric6.WebBrowser.WebBrowserWebSearchWidget.html#WebBrowserWebSearchWidget.__loadSearches" />
       <keyword name="WebBrowserWebSearchWidget.__newSuggestions" id="WebBrowserWebSearchWidget.__newSuggestions" ref="eric6.WebBrowser.WebBrowserWebSearchWidget.html#WebBrowserWebSearchWidget.__newSuggestions" />
       <keyword name="WebBrowserWebSearchWidget.__searchButtonClicked" id="WebBrowserWebSearchWidget.__searchButtonClicked" ref="eric6.WebBrowser.WebBrowserWebSearchWidget.html#WebBrowserWebSearchWidget.__searchButtonClicked" />
--- a/Documentation/Source/eric6.Helpviewer.GreaseMonkey.GreaseMonkeyManager.html	Sun Mar 04 14:52:46 2018 +0100
+++ b/Documentation/Source/eric6.Helpviewer.GreaseMonkey.GreaseMonkeyManager.html	Thu Mar 08 18:51:35 2018 +0100
@@ -270,15 +270,10 @@
 </dd>
 </dl><a NAME="GreaseMonkeyManager.pageLoadStarted" ID="GreaseMonkeyManager.pageLoadStarted"></a>
 <h4>GreaseMonkeyManager.pageLoadStarted</h4>
-<b>pageLoadStarted</b>(<i>frame</i>)
+<b>pageLoadStarted</b>(<i></i>)
 <p>
         Public slot to handle the start of loading a page.
-</p><dl>
-<dt><i>frame</i> (QWebFrame)</dt>
-<dd>
-reference to the main frame of the loading page
-</dd>
-</dl><a NAME="GreaseMonkeyManager.removeScript" ID="GreaseMonkeyManager.removeScript"></a>
+</p><a NAME="GreaseMonkeyManager.removeScript" ID="GreaseMonkeyManager.removeScript"></a>
 <h4>GreaseMonkeyManager.removeScript</h4>
 <b>removeScript</b>(<i>script</i>)
 <p>
--- a/Documentation/Source/eric6.Helpviewer.HelpBrowserWV.html	Sun Mar 04 14:52:46 2018 +0100
+++ b/Documentation/Source/eric6.Helpviewer.HelpBrowserWV.html	Thu Mar 08 18:51:35 2018 +0100
@@ -403,16 +403,13 @@
         Private slot to switch the display of access keys.
 </p><a NAME="HelpBrowser.__addExternalBinding" ID="HelpBrowser.__addExternalBinding"></a>
 <h4>HelpBrowser.__addExternalBinding</h4>
-<b>__addExternalBinding</b>(<i>frame, frameCleared</i>)
+<b>__addExternalBinding</b>(<i>frame=None</i>)
 <p>
         Private slot to add javascript bindings for adding search providers.
 </p><dl>
 <dt><i>frame</i> (QWebFrame)</dt>
 <dd>
 reference to the web frame
-</dd><dt><i>frameCleared</i> (bool)</dt>
-<dd>
-flag indicate, that the frame was cleared
 </dd>
 </dl><a NAME="HelpBrowser.__addSearchEngine" ID="HelpBrowser.__addSearchEngine"></a>
 <h4>HelpBrowser.__addSearchEngine</h4>
--- a/Documentation/Source/eric6.Helpviewer.HelpTabWidget.html	Sun Mar 04 14:52:46 2018 +0100
+++ b/Documentation/Source/eric6.Helpviewer.HelpTabWidget.html	Thu Mar 08 18:51:35 2018 +0100
@@ -338,16 +338,13 @@
 </dd>
 </dl><a NAME="HelpTabWidget.__loadFinished" ID="HelpTabWidget.__loadFinished"></a>
 <h4>HelpTabWidget.__loadFinished</h4>
-<b>__loadFinished</b>(<i>ok, browser</i>)
+<b>__loadFinished</b>(<i>ok</i>)
 <p>
         Private method to handle the loadFinished signal.
 </p><dl>
 <dt><i>ok</i> (bool)</dt>
 <dd>
 flag indicating the result
-</dd><dt><i>browser</i> (HelpBrowser)</dt>
-<dd>
-reference to the web browser
 </dd>
 </dl><a NAME="HelpTabWidget.__loadStarted" ID="HelpTabWidget.__loadStarted"></a>
 <h4>HelpTabWidget.__loadStarted</h4>
--- a/Documentation/Source/eric6.Helpviewer.HelpWebSearchWidget.html	Sun Mar 04 14:52:46 2018 +0100
+++ b/Documentation/Source/eric6.Helpviewer.HelpWebSearchWidget.html	Thu Mar 08 18:51:35 2018 +0100
@@ -66,12 +66,6 @@
 <td><a href="#HelpWebSearchWidget.__init__">HelpWebSearchWidget</a></td>
 <td>Constructor</td>
 </tr><tr>
-<td><a href="#HelpWebSearchWidget.__addEngineFromUrl">__addEngineFromUrl</a></td>
-<td>Private slot to add a search engine given its URL.</td>
-</tr><tr>
-<td><a href="#HelpWebSearchWidget.__changeCurrentEngine">__changeCurrentEngine</a></td>
-<td>Private slot to handle the selection of a search engine.</td>
-</tr><tr>
 <td><a href="#HelpWebSearchWidget.__completerActivated">__completerActivated</a></td>
 <td>Private slot handling the selection of an entry from the completer.</td>
 </tr><tr>
@@ -87,6 +81,9 @@
 <td><a href="#HelpWebSearchWidget.__getSuggestions">__getSuggestions</a></td>
 <td>Private slot to get search suggestions from the configured search engine.</td>
 </tr><tr>
+<td><a href="#HelpWebSearchWidget.__handleEnginesMenuActionTriggered">__handleEnginesMenuActionTriggered</a></td>
+<td>Private slot to handle an action of the menu being triggered.</td>
+</tr><tr>
 <td><a href="#HelpWebSearchWidget.__loadSearches">__loadSearches</a></td>
 <td>Private method to load the recently performed web searches.</td>
 </tr><tr>
@@ -138,26 +135,6 @@
 <dd>
 reference to the parent widget (QWidget)
 </dd>
-</dl><a NAME="HelpWebSearchWidget.__addEngineFromUrl" ID="HelpWebSearchWidget.__addEngineFromUrl"></a>
-<h4>HelpWebSearchWidget.__addEngineFromUrl</h4>
-<b>__addEngineFromUrl</b>(<i>action</i>)
-<p>
-        Private slot to add a search engine given its URL.
-</p><dl>
-<dt><i>action</i> (QAction)</dt>
-<dd>
-reference to the action that triggered
-</dd>
-</dl><a NAME="HelpWebSearchWidget.__changeCurrentEngine" ID="HelpWebSearchWidget.__changeCurrentEngine"></a>
-<h4>HelpWebSearchWidget.__changeCurrentEngine</h4>
-<b>__changeCurrentEngine</b>(<i>action</i>)
-<p>
-        Private slot to handle the selection of a search engine.
-</p><dl>
-<dt><i>action</i> (QAction)</dt>
-<dd>
-reference to the action that triggered
-</dd>
 </dl><a NAME="HelpWebSearchWidget.__completerActivated" ID="HelpWebSearchWidget.__completerActivated"></a>
 <h4>HelpWebSearchWidget.__completerActivated</h4>
 <b>__completerActivated</b>(<i>index</i>)
@@ -199,7 +176,17 @@
 <p>
         Private slot to get search suggestions from the configured search
         engine.
-</p><a NAME="HelpWebSearchWidget.__loadSearches" ID="HelpWebSearchWidget.__loadSearches"></a>
+</p><a NAME="HelpWebSearchWidget.__handleEnginesMenuActionTriggered" ID="HelpWebSearchWidget.__handleEnginesMenuActionTriggered"></a>
+<h4>HelpWebSearchWidget.__handleEnginesMenuActionTriggered</h4>
+<b>__handleEnginesMenuActionTriggered</b>(<i>action</i>)
+<p>
+        Private slot to handle an action of the menu being triggered.
+</p><dl>
+<dt><i>action</i> (QAction)</dt>
+<dd>
+reference to the action that triggered
+</dd>
+</dl><a NAME="HelpWebSearchWidget.__loadSearches" ID="HelpWebSearchWidget.__loadSearches"></a>
 <h4>HelpWebSearchWidget.__loadSearches</h4>
 <b>__loadSearches</b>(<i></i>)
 <p>
--- a/Documentation/Source/eric6.WebBrowser.WebBrowserPage.html	Sun Mar 04 14:52:46 2018 +0100
+++ b/Documentation/Source/eric6.WebBrowser.WebBrowserPage.html	Thu Mar 08 18:51:35 2018 +0100
@@ -94,9 +94,6 @@
 <td><a href="#WebBrowserPage.__fullScreenRequested">__fullScreenRequested</a></td>
 <td>Private slot handling a full screen request.</td>
 </tr><tr>
-<td><a href="#WebBrowserPage.__loadProgressSlot">__loadProgressSlot</a></td>
-<td>Private slot to implement a workaround for the loadFinished signal not working properly in Qt 5.10.0.</td>
-</tr><tr>
 <td><a href="#WebBrowserPage.__setupChannelTimeout">__setupChannelTimeout</a></td>
 <td>Private slot to initiate the setup of the web channel.</td>
 </tr><tr>
@@ -233,17 +230,6 @@
 <dd>
 reference to the full screen request
 </dd>
-</dl><a NAME="WebBrowserPage.__loadProgressSlot" ID="WebBrowserPage.__loadProgressSlot"></a>
-<h4>WebBrowserPage.__loadProgressSlot</h4>
-<b>__loadProgressSlot</b>(<i>progress</i>)
-<p>
-        Private slot to implement a workaround for the loadFinished signal
-        not working properly in Qt 5.10.0.
-</p><dl>
-<dt><i>progress</i> (int)</dt>
-<dd>
-load progress in percent
-</dd>
 </dl><a NAME="WebBrowserPage.__setupChannelTimeout" ID="WebBrowserPage.__setupChannelTimeout"></a>
 <h4>WebBrowserPage.__setupChannelTimeout</h4>
 <b>__setupChannelTimeout</b>(<i></i>)
--- a/Documentation/Source/eric6.WebBrowser.WebBrowserWebSearchWidget.html	Sun Mar 04 14:52:46 2018 +0100
+++ b/Documentation/Source/eric6.WebBrowser.WebBrowserWebSearchWidget.html	Thu Mar 08 18:51:35 2018 +0100
@@ -66,12 +66,6 @@
 <td><a href="#WebBrowserWebSearchWidget.__init__">WebBrowserWebSearchWidget</a></td>
 <td>Constructor</td>
 </tr><tr>
-<td><a href="#WebBrowserWebSearchWidget.__addEngineFromUrl">__addEngineFromUrl</a></td>
-<td>Private slot to add a search engine given its URL.</td>
-</tr><tr>
-<td><a href="#WebBrowserWebSearchWidget.__changeCurrentEngine">__changeCurrentEngine</a></td>
-<td>Private slot to handle the selection of a search engine.</td>
-</tr><tr>
 <td><a href="#WebBrowserWebSearchWidget.__completerActivated">__completerActivated</a></td>
 <td>Private slot handling the selection of an entry from the completer.</td>
 </tr><tr>
@@ -87,6 +81,9 @@
 <td><a href="#WebBrowserWebSearchWidget.__getSuggestions">__getSuggestions</a></td>
 <td>Private slot to get search suggestions from the configured search engine.</td>
 </tr><tr>
+<td><a href="#WebBrowserWebSearchWidget.__handleEnginesMenuActionTriggered">__handleEnginesMenuActionTriggered</a></td>
+<td>Private slot to handle an action of the menu being triggered.</td>
+</tr><tr>
 <td><a href="#WebBrowserWebSearchWidget.__loadSearches">__loadSearches</a></td>
 <td>Private method to load the recently performed web searches.</td>
 </tr><tr>
@@ -144,26 +141,6 @@
 <dd>
 reference to the parent widget
 </dd>
-</dl><a NAME="WebBrowserWebSearchWidget.__addEngineFromUrl" ID="WebBrowserWebSearchWidget.__addEngineFromUrl"></a>
-<h4>WebBrowserWebSearchWidget.__addEngineFromUrl</h4>
-<b>__addEngineFromUrl</b>(<i>action</i>)
-<p>
-        Private slot to add a search engine given its URL.
-</p><dl>
-<dt><i>action</i> (QAction)</dt>
-<dd>
-reference to the action that triggered
-</dd>
-</dl><a NAME="WebBrowserWebSearchWidget.__changeCurrentEngine" ID="WebBrowserWebSearchWidget.__changeCurrentEngine"></a>
-<h4>WebBrowserWebSearchWidget.__changeCurrentEngine</h4>
-<b>__changeCurrentEngine</b>(<i>action</i>)
-<p>
-        Private slot to handle the selection of a search engine.
-</p><dl>
-<dt><i>action</i> (QAction)</dt>
-<dd>
-reference to the action that triggered
-</dd>
 </dl><a NAME="WebBrowserWebSearchWidget.__completerActivated" ID="WebBrowserWebSearchWidget.__completerActivated"></a>
 <h4>WebBrowserWebSearchWidget.__completerActivated</h4>
 <b>__completerActivated</b>(<i>index</i>)
@@ -205,7 +182,17 @@
 <p>
         Private slot to get search suggestions from the configured search
         engine.
-</p><a NAME="WebBrowserWebSearchWidget.__loadSearches" ID="WebBrowserWebSearchWidget.__loadSearches"></a>
+</p><a NAME="WebBrowserWebSearchWidget.__handleEnginesMenuActionTriggered" ID="WebBrowserWebSearchWidget.__handleEnginesMenuActionTriggered"></a>
+<h4>WebBrowserWebSearchWidget.__handleEnginesMenuActionTriggered</h4>
+<b>__handleEnginesMenuActionTriggered</b>(<i>action</i>)
+<p>
+        Private slot to handle an action of the menu being triggered.
+</p><dl>
+<dt><i>action</i> (QAction)</dt>
+<dd>
+reference to the action that triggered
+</dd>
+</dl><a NAME="WebBrowserWebSearchWidget.__loadSearches" ID="WebBrowserWebSearchWidget.__loadSearches"></a>
 <h4>WebBrowserWebSearchWidget.__loadSearches</h4>
 <b>__loadSearches</b>(<i></i>)
 <p>
--- a/WebBrowser/WebBrowserPage.py	Sun Mar 04 14:52:46 2018 +0100
+++ b/WebBrowser/WebBrowserPage.py	Thu Mar 08 18:51:35 2018 +0100
@@ -86,9 +86,6 @@
         self.__printer = None
         self.__badSite = False
         
-        if qVersionTuple()[0:2] == (5, 10):
-            self.loadProgress.connect(self.__loadProgressSlot)
-        
         # Workaround for changing webchannel world inside
         # acceptNavigationRequest not working
         self.__channelUrl = QUrl()
@@ -105,18 +102,6 @@
         """
         self.__setupWebChannelForUrl(self.__channelUrl)
     
-    @pyqtSlot(int)
-    def __loadProgressSlot(self, progress):
-        """
-        Private slot to implement a workaround for the loadFinished signal
-        not working properly in Qt 5.10.0.
-        
-        @param progress load progress in percent
-        @type int
-        """
-        if progress == 100:
-            self.loadFinished.emit(True)
-    
     def acceptNavigationRequest(self, url, type_, isMainFrame):
         """
         Public method to determine, if a request may be accepted.

eric ide

mercurial