8000 Merge pull request #133 from stonebig/master · winpython/winpython@b336c3e · GitHub
[go: up one dir, main page]

Skip to content

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings

Commit b336c3e

Browse files
committed
Merge pull request #133 from stonebig/master
Qt5 fix to work with Spyder 3.0.0dev
2 parents 27beeac + de8400c commit b336c3e

File tree

2 files changed

+11
-0
lines changed

2 files changed

+11
-0
lines changed

make.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,7 @@ def replace_in_nsis_file(fname, data):
7272
lines[idx] = line[:len(start)+1] + ('"%s"' % text) + '\n'
7373
fd = open(fname, 'w')
7474
fd.writelines(lines)
75+
print('nsis for ', fname, 'is', lines)
7576
fd.close()
7677

7778

portable/launcher.nsi

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,8 @@ Licensed under the terms of the MIT License
2121
!define JULIA ""
2222
; Addition for JULIA_PKGDIR
2323
!define JULIA_PKGDIR ""
24+
; Addition for QT_API(used by Spyder)
25+
!define QT_API ""
2426

2527
!define COMMAND ""
2628
!define PARAMETERS ""
@@ -88,6 +90,14 @@ System::Call 'Kernel32::SetEnvironmentVariableA(t, t) i("JULIA_PKGDIR", "${JULIA
8890

8991
end_Julia_settings:
9092

93+
94+
; Addition for QT_API if Qt5 detected
95+
StrCmp "${QT_API}" "" end_QT_API_settings
96+
IfFileExists "${WINPYDIR}\Lib\site-packages\PyQt5\*.*" 0 end_QT_API_settings
97+
System::Call 'Kernel32::SetEnvironmentVariableA(t, t) i("QT_API", "${QT_API}").r0'
98+
99+
end_QT_API_settings:
100+
91101
;================================================================
92102
; Settings directory
93103
IfFileExists "$EXEDIR\settings\*.*" 0 end_settings

0 commit comments

Comments
 (0)
0