diff options
| author | Joerg Bornemann <joerg.bornemann@qt.io> | 2020-10-23 10:52:22 +0200 |
|---|---|---|
| committer | Joerg Bornemann <joerg.bornemann@qt.io> | 2020-10-23 21:11:55 +0200 |
| commit | 351d066adb5caa96f2e0739df5fc0601976a5248 (patch) | |
| tree | 608952a38d0ce49bd09d5627454a65b40a61bb2e /bin | |
| parent | f22644c5fa8ddb7442a8dc89e29775544576d060 (diff) | |
CMake: Put the -qtconf argument in front in the qmake wrapper
For QMake's -install argument it's necessary to have -qtconf in front.
Task-number: QTBUG-87801
Change-Id: I042acdd143972cc4065660035b02678db891157f
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'bin')
| -rw-r--r-- | bin/qmake-wrapper-for-target.bat.in | 2 | ||||
| -rw-r--r-- | bin/qmake-wrapper-for-target.in | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/bin/qmake-wrapper-for-target.bat.in b/bin/qmake-wrapper-for-target.bat.in index cce775a768..8df27eaa44 100644 --- 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 index 0c81b7c62f..265ce760de 100644 --- 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" $* |