Some fixes for the Web Browser NG related to Qt 5.8.

Wed, 22 Mar 2017 18:45:15 +0100

author
Detlev Offenbach <detlev@die-offenbachs.de>
date
Wed, 22 Mar 2017 18:45:15 +0100
changeset 5650
4c52f07c186e
parent 5649
b99ba3acefc1
child 5651
982465f8389c

Some fixes for the Web Browser NG related to Qt 5.8.

Preferences/ConfigurationPages/WebBrowserSpellCheckingPage.py file | annotate | diff | comparison | revisions
WebBrowser/GreaseMonkey/GreaseMonkeyScript.py file | annotate | diff | comparison | revisions
--- a/Preferences/ConfigurationPages/WebBrowserSpellCheckingPage.py	Wed Mar 22 18:44:05 2017 +0100
+++ b/Preferences/ConfigurationPages/WebBrowserSpellCheckingPage.py	Wed Mar 22 18:45:15 2017 +0100
@@ -42,10 +42,10 @@
             dictionaryDirectories = {
                 QDir.cleanPath(
                     QCoreApplication.applicationDirPath() +
-                    "/../Contents/Resources/qtwebengine_dictionaries"),
+                    "/../Resources/qtwebengine_dictionaries"),
                 QDir.cleanPath(
                     QCoreApplication.applicationDirPath() +
-                    "/../Contents/Frameworks/QtWebEngineCore.framework"
+                    "/../Frameworks/QtWebEngineCore.framework"
                     "/Resources/qtwebengine_dictionaries"),
             }
         else:
--- a/WebBrowser/GreaseMonkey/GreaseMonkeyScript.py	Wed Mar 22 18:44:05 2017 +0100
+++ b/WebBrowser/GreaseMonkey/GreaseMonkeyScript.py	Wed Mar 22 18:45:15 2017 +0100
@@ -360,13 +360,13 @@
             raise ValueError("Wrong script start point.")
         
         script = QWebEngineScript()
+        script.setSourceCode("{0}\n{1}".format(
+            bootstrap_js, self.__script
+        ))
         script.setName(self.fullName())
         script.setInjectionPoint(injectionPoint)
         script.setWorldId(WebBrowserPage.SafeJsWorld)
         script.setRunsOnSubFrames(not self.__noFrames)
-        script.setSourceCode("{0}\n{1}".format(
-            bootstrap_js, self.__script
-        ))
         return script
     
     def __toJavaScriptList(self, patterns):

eric ide

mercurial