Skip to content

remove QtDemo and QtAssistant icons #342

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
merged 1 commit into from
Jun 5, 2016
Merged

remove QtDemo and QtAssistant icons #342

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
19 changes: 6 additions & 13 deletions make.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -515,15 +515,7 @@ def _create_launchers(self):
command='wscript.exe',
args=r'Noshell.vbs wpcp.bat')

# Multi-Qt launchers (Qt5 has priority if found)
self.create_launcher('Qt Demo.exe', 'qt.ico',
command='wscript.exe',
args=r'Noshell.vbs qtdemo.bat')

self.create_launcher('Qt Assistant.exe', 'qtassistant.ico',
command='wscript.exe',
args=r'Noshell.vbs qtassistant.bat')

# Multi-Qt launchers
self.create_launcher('Qt Designer.exe', 'qtdesigner.ico',
command='wscript.exe',
args=r'Noshell.vbs qtdesigner.bat')
Expand Down Expand Up @@ -930,10 +922,11 @@ def _create_batch_scripts(self):
self.create_batch_script('qtdemo.bat',r"""@echo off
call "%~dp0env_for_icons.bat"
cd/D "%WINPYWORKDIR%"
if "%QT_API%"=="pyqt5" (
"%WINPYDIR%\python.exe" "%WINPYDIR%\Lib\site-packages\PyQt5\examples\qtdemo\qtdemo.py"
) else (
"%WINPYDIR%\pythonw.exe" "%WINPYDIR%\Lib\site-packages\PyQt4\examples\demos\qtdemo\qtdemo.pyw"
if exist "%WINPYDIR%\Lib\site-packages\PyQt5\examples\qtdemo\qtdemo.py" (
"%WINPYDIR%\python.exe" "%WINPYDIR%\Lib\site-packages\PyQt5\examples\qtdemo\qtdemo.py"
)
if exist "%WINPYDIR%\Lib\site-packages\PyQt4\examples\demos\qtdemo\qtdemo.pyw" (
"%WINPYDIR%\pythonw.exe" "%WINPYDIR%\Lib\site-packages\PyQt4\examples\demos\qtdemo\qtdemo.pyw"
)
""")

Expand Down