Mercurial Repositories > eric / file diff

--- a/eric6/Preferences/__init__.py	Sat Dec 07 14:16:25 2019 +0100
+++ b/eric6/Preferences/__init__.py	Wed Jan 01 12:01:54 2020 +0100
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-# Copyright (c) 2002 - 2019 Detlev Offenbach <detlev@die-offenbachs.de>
+# Copyright (c) 2002 - 2020 Detlev Offenbach <detlev@die-offenbachs.de>
 #
 
 """
@@ -1181,6 +1181,15 @@
             })
         except AttributeError:
             pass
+        try:
+            # Qt 5.13
+            cls.webBrowserDefaults.update({
+                "PdfViewerEnabled":
+                    webEngineSettings.testAttribute(
+                        QWebEngineSettings.PdfViewerEnabled),
+            })
+        except AttributeError:
+            pass
         
         cls.webEngineSettingsIntitialized = True
     
@@ -1569,9 +1578,11 @@
     """
     Module function to initialize the central configuration store.
     """
+    from E5Gui.E5Application import e5App
     Prefs.settings = QSettings(
         QSettings.IniFormat, QSettings.UserScope,
-        Globals.settingsNameOrganization, Globals.settingsNameGlobal)
+        Globals.settingsNameOrganization, Globals.settingsNameGlobal,
+        e5App())
     if not Globals.isWindowsPlatform():
         hp = QDir.homePath()
         dn = QDir(hp)
@@ -2795,6 +2806,7 @@
                  "WebRTCPublicInterfacesOnly", "DnsPrefetchEnabled",
                  "FlashCookiesDeleteOnStartExit", "FlashCookieAutoRefresh",
                  "FlashCookieNotify", "VirusTotalEnabled", "VirusTotalSecure",
+                 "PdfViewerEnabled",
                  ]:
         return toBool(prefClass.settings.value(
             "WebBrowser/" + key, prefClass.webBrowserDefaults[key]))