Including qt.conf within PyQt5 for inner executables, such as qmlscene.exe and qmlscene_wrapper.bat

mottosso · mottosso · commit 2b7d972b5ff3 · 2014-09-29T18:55:49.000+01:00
diff --git a/PyQt5/__init__.py b/PyQt5/__init__.py
@@ -31,7 +31,7 @@
 os.environ['QT_QPA_PLATFORM_PLUGIN_PATH'] = plugin_path
 
 # Expose versions
-version_info = (0, 1, 4)  # Version of this release
+version_info = (0, 1, 5)  # Version of this release
 version = "%s.%s.%s" % version_info
 __version__ = version
 
diff --git a/PyQt5/qmlscene_wrapper.bat b/PyQt5/qmlscene_wrapper.bat
@@ -1,2 +1,2 @@
 set QT_QPA_PLATFORM_PLUGIN_PATH=%CD%\plugins\platforms
-start "" qmlscene.exe
+start "" qmlscene.exe %*
diff --git a/PyQt5/qmlviewer_wrapper.bat b/PyQt5/qmlviewer_wrapper.bat
@@ -1,2 +1,2 @@
 set QT_QPA_PLATFORM_PLUGIN_PATH=%CD%\plugins\platforms
-start "" qmlviewer.exe
+start "" qmlviewer.exe  %*
diff --git a/PyQt5/qt.conf b/PyQt5/qt.conf
@@ -0,0 +1,3 @@
+[Paths]
+Prefix = C:/Python27/Lib/site-packages/PyQt5
+Binaries = C:/Python27/Lib/site-packages/PyQt5

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`	`1`	`set QT_QPA_PLATFORM_PLUGIN_PATH=%CD%\plugins\platforms`
`2`		`-start "" qmlscene.exe`
	`2`	`+start "" qmlscene.exe %*`
Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`	`1`	`set QT_QPA_PLATFORM_PLUGIN_PATH=%CD%\plugins\platforms`
`2`		`-start "" qmlviewer.exe`
	`2`	`+start "" qmlviewer.exe %*`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+[Paths]`
	`2`	`+Prefix = C:/Python27/Lib/site-packages/PyQt5`
	`3`	`+Binaries = C:/Python27/Lib/site-packages/PyQt5`