Merge pull request #342 from stonebig/master

stonebig · stonebig · commit 764dc341444c · 2016-06-05T12:29:01.000+02:00
remove QtDemo and QtAssistant icons
diff --git a/make.py b/make.py
@@ -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')
@@ -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"
 )
 """)
 
