diff options
| author | Joerg Bornemann <joerg.bornemann@qt.io> | 2020-10-23 10:37:24 +0200 |
|---|---|---|
| committer | Joerg Bornemann <joerg.bornemann@qt.io> | 2020-10-23 21:11:46 +0200 |
| commit | 661b586a69740bd9a1791622f8b238d290ebe00d (patch) | |
| tree | 88e37fc8a38337b3c5a277ff83b87072743dadfb /qmake | |
| parent | 4bf8f70bfe74b33627cd93e1e36c0ee28a69a034 (diff) | |
Make "qmake -qtconf my-qt.conf -query" possible
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>
Diffstat (limited to 'qmake')
| -rw-r--r-- | qmake/option.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/qmake/option.cpp b/qmake/option.cpp index df8a5742a1..9c435efb89 100644 --- a/qmake/option.cpp +++ b/qmake/option.cpp @@ -420,6 +420,11 @@ Option::init(int argc, char **argv) Option::qmake_mode = Option::QMAKE_QUERY_PROPERTY; } else if (opt == "-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 { break; } |