From 351d066adb5caa96f2e0739df5fc0601976a5248 Mon Sep 17 00:00:00 2001 From: Joerg Bornemann Date: Fri, 23 Oct 2020 10:52:22 +0200 Subject: [PATCH] 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 --- bin/qmake-wrapper-for-target.bat.in | 2 +- 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 cce775a7687..8df27eaa443 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 0c81b7c62f6..265ce760de3 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" $*