QT_API setting is now dynamic

stonebig · stonebig · commit 160a70aa04d9 · 2015-08-27T16:47:37.000+02:00
diff --git a/make.py b/make.py
@@ -126,11 +126,6 @@ def __init__(self, build_number, release_level, target, wheeldir,
         self.rootdir = rootdir  # addded to build from winpython
         self.install_options = install_options
         self.flavor = flavor
-        self.QT_API='pyqt' # default Qt4
-        import glob
-        if len(glob.glob(osp.join(self.wheeldir, 'PyQt5*.*'))) > 0:
-            self.QT_API='pyqt5' # force Qt5 on Spyder
-        print('QT_API is "%s"' % self.QT_API)
 
     @property
     def package_index_wiki(self):
@@ -341,8 +336,7 @@ def create_launcher(self, name, icon, command=None,
         data += [('R_HOME', '$EXEDIR%s' % r'\tools\R'),
                  ('JULIA_PKGDIR', '$EXEDIR%s' % r'\settings\.julia'),
                  ('JULIA_HOME', '$EXEDIR%s' % r'\tools\Julia\bin'),
-                 ('JULIA', '$EXEDIR%s' % r'\tools\Julia\bin\julia.exe'),
-                 ('QT_API', '%s' % self.QT_API)]
+                 ('JULIA', '$EXEDIR%s' % r'\tools\Julia\bin\julia.exe')]
 
         if settingspath is not None:
             data += [('SETTINGSDIR', osp.dirname(settingspath)),
@@ -616,8 +610,8 @@ def _create_batch_scripts_initial(self):
 
 set PATH=""" + path + """
 
-rem force default Qt kit for Spyder
-set QT_API=""" + self.QT_API)
+rem force default pyqt5 kit for Spyder if PyQt5 module is there
+if exist %WINPYDIR%\Lib\site-packages\PyQt5 set QT_API=pyqt5""")
 
     def _create_batch_scripts(self):
         """Create batch scripts"""
diff --git a/portable/launcher.nsi b/portable/launcher.nsi
@@ -21,8 +21,6 @@ Licensed under the terms of the MIT License
 !define JULIA ""
 ;  Addition for JULIA_PKGDIR
 !define JULIA_PKGDIR ""
-;  Addition for QT_API(used by Spyder)
-!define QT_API ""
 
 !define COMMAND ""
 !define PARAMETERS ""
@@ -91,10 +89,9 @@ System::Call 'Kernel32::SetEnvironmentVariableA(t, t) i("JULIA_PKGDIR", "${JULIA
 end_Julia_settings:
 
 
-;  Addition for QT_API if Qt5 detected
-StrCmp "${QT_API}" "" end_QT_API_settings
+;  Addition for QT_API=pyqt5 if Qt5 detected
 IfFileExists "${WINPYDIR}\Lib\site-packages\PyQt5\*.*" 0 end_QT_API_settings
-System::Call 'Kernel32::SetEnvironmentVariableA(t, t) i("QT_API", "${QT_API}").r0'
+System::Call 'Kernel32::SetEnvironmentVariableA(t, t) i("QT_API", "pyqt5").r0'
 
 end_QT_API_settings:
 
