summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOswald Buddenhagen <oswald.buddenhagen@qt.io>2016-12-23 16:26:50 +0100
committerOswald Buddenhagen <oswald.buddenhagen@qt.io>2016-12-30 10:25:42 +0000
commit7549bbbacbdadacb283ae73ccb8b415a3dbe0c7c (patch)
treef0f50b2fdafbd2aeebfac37b714aa3096cc9b509
parent8292326f1bc986f8d87b9f3c244a5e0eb06563f9 (diff)
fail early after command line parsing error
we don't want to do the (possibly interactive) license check when the command line is not valid. Task-number: QTBUG-18459 Change-Id: I68c3b7ed4646e49865922ab5612f971930698356 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
-rw-r--r--mkspecs/features/qt_configure.prf1
1 files changed, 1 insertions, 0 deletions
diff --git a/mkspecs/features/qt_configure.prf b/mkspecs/features/qt_configure.prf
index c20a9672e4..e8bddbf09f 100644
--- a/mkspecs/features/qt_configure.prf
+++ b/mkspecs/features/qt_configure.prf
@@ -1772,6 +1772,7 @@ for (currentConfig, allConfigs): \
QMAKE_SAVED_ARGS = $$QMAKE_EXTRA_ARGS
QMAKE_REDO_CONFIG = false
qtConfParseCommandLine()
+qtConfCheckErrors()
for (currentConfig, allConfigs) {
qtConfSetModuleName()