diff -r c48e8cfc9704 -r 2bba16cc7f39 eric6_tray.py
--- a/eric6_tray.py Sat Feb 07 12:43:00 2015 +0100
+++ b/eric6_tray.py Sun Feb 08 13:23:22 2015 +0100
@@ -14,6 +14,10 @@
from __future__ import unicode_literals
+import sys
+
+PyQt4Option = "--pyqt4" in sys.argv
+
import Toolbox.PyQt4ImportHook # __IGNORE_WARNING__
try: # Only for Py2
@@ -21,8 +25,6 @@
except (ImportError):
pass
-import sys
-
for arg in sys.argv:
if arg.startswith("--config="):
import Globals
@@ -43,8 +45,10 @@
@param argv list of commandline parameters (list of strings)
@return reference to the main widget (QWidget)
"""
+ global PyQt4Option
+
from Tools.TrayStarter import TrayStarter
- return TrayStarter()
+ return TrayStarter(PyQt4Option)
def main():
