diff options
| author | Joerg Bornemann <joerg.bornemann@qt.io> | 2019-01-23 13:03:44 +0100 |
|---|---|---|
| committer | Kai Koehne <kai.koehne@qt.io> | 2019-01-29 10:51:10 +0000 |
| commit | 11ae0e772cccd3028771c1380f077c605224cc19 (patch) | |
| tree | 5a441b26ca12e573fb6cec7a69cf4fd1f619b4fc /mkspecs | |
| parent | 44cf8cea8e5f496cab637930a942611b9026994a (diff) | |
Consume the -skip option in qtbase/configure
...and yield a warning that -skip has no effect in a qtbase build.
This is consistent with configure's help output and enables us to
always pass "-skip qtwhatnot", whether we're calling top-level or
qtbase configure.
Change-Id: Ie5b0791a6000d1d78b1367658ad86a92b2ec6a6a
Fixes: QTBUG-71253
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
Reviewed-by: Kai Koehne <kai.koehne@qt.io>
Diffstat (limited to 'mkspecs')
| -rw-r--r-- | mkspecs/features/qt_configure.prf | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/mkspecs/features/qt_configure.prf b/mkspecs/features/qt_configure.prf index c45439c3ef..9998d6971c 100644 --- a/mkspecs/features/qt_configure.prf +++ b/mkspecs/features/qt_configure.prf @@ -333,6 +333,15 @@ defineTest(qtConfParseCommandLine) { type = boolean } + isEmpty(type):contains(opt, "skip") { + isEmpty(skipOptionWarningAdded) { + qtConfAddWarning("Command line option -skip is only effective in top-level builds.") + skipOptionWarningAdded = 1 + } + $$qtConfGetNextCommandlineArg() + next() + } + isEmpty(type) { qtConfAddError("Unknown command line option '$$c'.") return() |