eric6/eric6.py

branch
without_py2_and_pyqt4
changeset 7198
684261ef2165
parent 7192
a22eee00b052
child 7229
53054eb5b15a
--- a/eric6/eric6.py	Sun Sep 01 17:44:33 2019 +0200
+++ b/eric6/eric6.py	Sun Sep 01 19:40:53 2019 +0200
@@ -20,15 +20,12 @@
 
 # generate list of arguments to be remembered for a restart
 restartArgsList = ["--no-splash", "--plugin", "--debug", "--config",
-                   "--pyqt4", "--settings", "--disable-crash",
-                   "--disable-plugin"]
+                   "--settings", "--disable-crash", "--disable-plugin"]
 restartArgs = [arg for arg in sys.argv[1:]
                if arg.split("=", 1)[0] in restartArgsList]
 
 sys.path.insert(1, os.path.dirname(__file__))
 
-import Toolbox.PyQt4ImportHook  # __IGNORE_WARNING__
-
 try:
     try:
         from PyQt5 import sip       # __IGNORE_EXCEPTION__
@@ -260,8 +257,6 @@
          "disable the given plug-in (may be repeated)"),
         ("--plugin=plugin-file",
          "load the given plugin file (plugin development)"),
-        ("--pyqt4",
-         "force use of PyQt4 in environments that have both PyQt variants"),
         ("--settings=settingsDir",
          "use the given directory to store the settings files"),
         ("--start-file", "load the most recently opened file"),
@@ -361,7 +356,7 @@
     if len(sys.argv) > 1:
         args = sys.argv[1:]
     
-    # get the Qt4 translations directory
+    # get the Qt translations directory
     qtTransDir = Preferences.getQtTranslationsDir()
     if not qtTransDir:
         qtTransDir = QLibraryInfo.location(QLibraryInfo.TranslationsPath)

eric ide

mercurial