From 11ae0e772cccd3028771c1380f077c605224cc19 Mon Sep 17 00:00:00 2001
From: Joerg Bornemann <joerg.bornemann@qt.io>
Date: Wed, 23 Jan 2019 13:03:44 +0100
Subject: 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>
---
 mkspecs/features/qt_configure.prf | 9 +++++++++
 1 file changed, 9 insertions(+)

(limited to 'mkspecs')

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()
-- 
cgit v1.2.3