CMake: Put the -qtconf argument in front in the qmake wrapper

jobor · jobor · commit 351d066adb5c · 2020-10-23T21:11:55.000+02:00
For QMake's -install argument it's necessary to have -qtconf in front.

Task-number: QTBUG-87801
Change-Id: I042acdd143972cc4065660035b02678db891157f
Reviewed-by: Alexandru Croitor &lt;alexandru.croitor@qt.io&gt;
diff --git a/bin/qmake-wrapper-for-target.bat.in b/bin/qmake-wrapper-for-target.bat.in
@@ -1,2 +1,2 @@
 @echo off
-@host_qt_bindir@\qmake.exe %* -qtconf "%~dp0\target_qt.conf"
+@host_qt_bindir@\qmake.exe -qtconf "%~dp0\target_qt.conf" %*
diff --git a/bin/qmake-wrapper-for-target.in b/bin/qmake-wrapper-for-target.in
@@ -4,4 +4,4 @@
 script_dir_path=`dirname $0`
 script_dir_path=`(cd "$script_dir_path"; /bin/pwd)`
 
-@host_qt_bindir@/qmake $* -qtconf "$script_dir_path/target_qt.conf"
+@host_qt_bindir@/qmake -qtconf "$script_dir_path/target_qt.conf" $*

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`	`1`	`@echo off`
`2`		`-@host_qt_bindir@\qmake.exe %* -qtconf "%~dp0\target_qt.conf"`
	`2`	`+@host_qt_bindir@\qmake.exe -qtconf "%~dp0\target_qt.conf" %*`