Skip to content

Commit

Permalink
CMake: Put the -qtconf argument in front in the qmake wrapper
Browse files Browse the repository at this point in the history
For QMake's -install argument it's necessary to have -qtconf in front.

Task-number: QTBUG-87801
Change-Id: I042acdd143972cc4065660035b02678db891157f
Reviewed-by: Alexandru Croitor <[email protected]>
  • Loading branch information
jobor committed Oct 23, 2020
1 parent f22644c commit 351d066
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion bin/qmake-wrapper-for-target.bat.in
Original file line number Diff line number Diff line change
@@ -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" %*
2 changes: 1 addition & 1 deletion bin/qmake-wrapper-for-target.in
Original file line number Diff line number Diff line change
Expand Up @@ -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" $*

0 comments on commit 351d066

Please sign in to comment.