Merge pull request #133 from stonebig/master

stonebig · stonebig · commit b336c3ec8c9f · 2015-07-23T20:14:18.000+02:00
Qt5 fix to work with Spyder 3.0.0dev
diff --git a/make.py b/make.py
@@ -72,6 +72,7 @@ def replace_in_nsis_file(fname, data):
                 lines[idx] = line[:len(start)+1] + ('"%s"' % text) + '\n'
     fd = open(fname, 'w')
     fd.writelines(lines)
+    print('nsis for ', fname, 'is', lines)
     fd.close()
 
 
diff --git a/portable/launcher.nsi b/portable/launcher.nsi
@@ -21,6 +21,8 @@ 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 ""
@@ -88,6 +90,14 @@ 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
+IfFileExists "${WINPYDIR}\Lib\site-packages\PyQt5\*.*" 0 end_QT_API_settings
+System::Call 'Kernel32::SetEnvironmentVariableA(t, t) i("QT_API", "${QT_API}").r0'
+
+end_QT_API_settings:
+
 ;================================================================
 ; Settings directory
 IfFileExists "$EXEDIR\settings\*.*" 0 end_settings
