summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoerg Bornemann <joerg.bornemann@qt.io>2019-01-24 15:06:19 +0100
committerKai Koehne <kai.koehne@qt.io>2019-01-29 10:51:19 +0000
commitc2b0bca98429853bcd1f91dff5ae44742b48bc1f (patch)
treed1e3600066e21ea7db4f0a8e80477e106dad4ea8
parent11ae0e772cccd3028771c1380f077c605224cc19 (diff)
configure: Respect -continue in qtConfParseCommandLine
If configure is called with -continue, it should not stop processing command line arguments after encountering an invalid one. Example: configure ... -continue -quack -no-feature-gui would ignore everything after -quack. Change-Id: Ia5f0cb13414c9c0c7246ff0c72f8e935fe6dca3c Fixes: QTBUG-72912 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
-rw-r--r--mkspecs/features/qt_configure.prf5
1 files changed, 4 insertions, 1 deletions
diff --git a/mkspecs/features/qt_configure.prf b/mkspecs/features/qt_configure.prf
index 9998d6971c..7ca65c92b3 100644
--- a/mkspecs/features/qt_configure.prf
+++ b/mkspecs/features/qt_configure.prf
@@ -344,7 +344,10 @@ defineTest(qtConfParseCommandLine) {
isEmpty(type) {
qtConfAddError("Unknown command line option '$$c'.")
- return()
+ equals(config.input.continue, yes): \
+ next()
+ else: \
+ return()
}
call = "qtConfCommandline_$${type}"