Changed some code to (hopefully) get rid of a crash with upcoming PyQt 5.12.

Wed, 06 Feb 2019 19:14:50 +0100

author
Detlev Offenbach <detlev@die-offenbachs.de>
date
Wed, 06 Feb 2019 19:14:50 +0100
changeset 6702
793af5761910
parent 6699
6c1f84f4b305
child 6703
31b0306f0ecc

Changed some code to (hopefully) get rid of a crash with upcoming PyQt 5.12.

Toolbox/Startup.py file | annotate | diff | comparison | revisions
eric6.py file | annotate | diff | comparison | revisions
eric6_browser.py file | annotate | diff | comparison | revisions
eric6_trpreviewer.py file | annotate | diff | comparison | revisions
eric6_webbrowser.py file | annotate | diff | comparison | revisions
--- a/Toolbox/Startup.py	Tue Feb 05 19:35:13 2019 +0100
+++ b/Toolbox/Startup.py	Wed Feb 06 19:14:50 2019 +0100
@@ -24,6 +24,8 @@
 
 from eric6config import getConfig
 
+application = None
+
 
 def usage(appinfo, optlen=12):
     """
@@ -220,11 +222,14 @@
         handler dialog (boolean)
     @return exit result (integer)
     """
+    global application
+    
     handleArgs(argv, appinfo)
     if app is None:
         # set the library paths for plugins
         setLibraryPaths()
         app = E5Application(argv)
+        application = app
     app.setQuitOnLastWindowClosed(quitOnLastWindowClosed)
     
     # the following code depends upon a valid application object
--- a/eric6.py	Tue Feb 05 19:35:13 2019 +0100
+++ b/eric6.py	Wed Feb 06 19:14:50 2019 +0100
@@ -74,6 +74,7 @@
 mainWindow = None
 splash = None
 inMainLoop = None
+app = None
 
 if "--debug" in sys.argv:
     del sys.argv[sys.argv.index("--debug")]
@@ -258,7 +259,7 @@
     from Globals import AppInfo
     import Globals
     
-    global args, mainWindow, splash, restartArgs, inMainLoop
+    global app, args, mainWindow, splash, restartArgs, inMainLoop
     
     sys.excepthook = excepthook
     
--- a/eric6_browser.py	Tue Feb 05 19:35:13 2019 +0100
+++ b/eric6_browser.py	Wed Feb 06 19:14:50 2019 +0100
@@ -35,6 +35,8 @@
 
 from Globals import qVersionTuple
 
+app = None
+
 
 if qVersionTuple() < (5, 6, 0):
     if "--quiet" not in sys.argv:
@@ -158,6 +160,8 @@
     """
     Main entry point into the application.
     """
+    global app
+    
     options = [
         ("--config=configDir",
          "use the given directory as the one containing the config files"),
--- a/eric6_trpreviewer.py	Tue Feb 05 19:35:13 2019 +0100
+++ b/eric6_trpreviewer.py	Wed Feb 06 19:14:50 2019 +0100
@@ -46,6 +46,8 @@
 
 from Toolbox import Startup
 
+app = None
+
 
 def createMainWidget(argv):
     """
@@ -69,6 +71,8 @@
     """
     Main entry point into the application.
     """
+    global app
+    
     options = [
         ("--config=configDir",
          "use the given directory as the one containing the config files"),
--- a/eric6_webbrowser.py	Tue Feb 05 19:35:13 2019 +0100
+++ b/eric6_webbrowser.py	Wed Feb 06 19:14:50 2019 +0100
@@ -80,6 +80,8 @@
 
 from Helpviewer.HelpSingleApplication import HelpSingleApplicationClient
 
+app = None
+
 
 def createMainWidget(argv):
     """
@@ -134,6 +136,8 @@
     """
     Main entry point into the application.
     """
+    global app
+    
     options = [
         ("--config=configDir",
          "use the given directory as the one containing the config files"),

eric ide

mercurial