Skip to content

Qt5 fix to work with Spyder 3.0.0dev #133

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
stonebig merged 1 commit into from
Jul 23, 2015
Merged

Qt5 fix to work with Spyder 3.0.0dev #133

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions make.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()


Expand Down
10 changes: 10 additions & 0 deletions portable/launcher.nsi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 ""
Expand Down Expand Up @@ -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
Expand Down