1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make "qmake -qtconf my-qt.conf -query" possible

Browse Source 
It's now possible to put the -qtconf argument in front of the -query
argument (and others).

Fixes: QTBUG-85136
Change-Id: I74b78f084acf264ef637ed2f6cb63b655b176056
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
This commit is contained in:
Joerg Bornemann 2020-10-23 10:37:24 +02:00
parent 4bf8f70bfe
commit 661b586a69
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
qmake/option.cpp
View File

@ -420,6 +420,11 @@ Option::init(int argc, char **argv)
Option::qmake_mode = Option::QMAKE_QUERY_PROPERTY; Option::qmake_mode = Option::QMAKE_QUERY_PROPERTY;
} else if (opt == "-makefile") { } else if (opt == "-makefile") {
Option::qmake_mode = Option::QMAKE_GENERATE_MAKEFILE; Option::qmake_mode = Option::QMAKE_GENERATE_MAKEFILE;
} else if (opt == "-qtconf") {
// Move the argument following "-qtconf <file>" in front and check again.
if (args.length() >= 3)
args.prepend(args.takeAt(2));
continue;
} else { } else {
break; break;
} }