diff options
| author | Joerg Bornemann <joerg.bornemann@qt.io> | 2020-10-20 08:34:01 +0200 |
|---|---|---|
| committer | Joerg Bornemann <joerg.bornemann@qt.io> | 2020-10-20 09:16:27 +0200 |
| commit | 6089888d1d6c2b6ab6b8b788ccec951b58292cd8 (patch) | |
| tree | 265a78ad6145b9e0838525f00881db2deb289e8a /mkspecs/features/qt_configure.prf | |
| parent | dc6c26366727b85f9b28c50da3a75a653e37c5d8 (diff) | |
Make configure -qmake actually work
We need to ignore this option in qt_configure.prf.
This amends 077ea0c63326013ff6d9c85e59b322ffc2ec278c.
Task-number: QTBUG-87049
Change-Id: If05b16a95d0830df9ca63961576981f8983820cc
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
Diffstat (limited to 'mkspecs/features/qt_configure.prf')
| -rw-r--r-- | mkspecs/features/qt_configure.prf | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/mkspecs/features/qt_configure.prf b/mkspecs/features/qt_configure.prf index 93448acb91..4c18dbf953 100644 --- a/mkspecs/features/qt_configure.prf +++ b/mkspecs/features/qt_configure.prf @@ -340,6 +340,11 @@ defineTest(qtConfParseCommandLine) { type = boolean } + # Skip the -qmake option. + isEmpty(type):contains(opt, "qmake") { + next() + } + isEmpty(type):contains(opt, "skip") { isEmpty(skipOptionWarningAdded) { qtConfAddWarning("Command line option -skip is only effective in top-level builds.") |