From c167308c5d8d1660ca517c94ce977a8eb440a99a Mon Sep 17 00:00:00 2001
From: Lars Knoll <lars.knoll@qt.io>
Date: Wed, 29 Jun 2016 15:02:35 +0200
Subject: Fix handling of -v/-verbose command line flags to configure

This is not a feature that should get propagated to other
configure runs, so simply hardcode support for it.

Change-Id: Ieb1c33243154b3583e91061d3592d7e87c36f402
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
---
 configure.json                    |  9 ---------
 configure.pri                     | 10 ----------
 mkspecs/features/qt_configure.prf |  7 +++++++
 3 files changed, 7 insertions(+), 19 deletions(-)

diff --git a/configure.json b/configure.json
index 440e6a6b6a..a996e539d8 100644
--- a/configure.json
+++ b/configure.json
@@ -169,8 +169,6 @@
             "testcocoon": "boolean",
             "tslib": "boolean",
             "use-gold-linker": { "type": "boolean", "name": "use_gold_linker" },
-            "v": { "type": "void", "name": "verbose" },
-            "verbose": "void",
             "warnings-are-errors": { "type": "boolean", "name": "warnings_are_errors" },
             "Werror": { "type": "boolean", "name": "warnings_are_errors" },
             "widgets": "boolean",
@@ -943,13 +941,6 @@
     },
 
     "features": {
-        "verbose": {
-            "description": "Verbose configure output",
-            "autoDetect": false,
-            "output": [ "verbose" ],
-            "priority": -4
-        },
-
         "shared": {
             "description": "Building shared libraries",
             "condition": "!config.ios && !config.integrity",
diff --git a/configure.pri b/configure.pri
index 7ed7544053..5ba2859aa1 100644
--- a/configure.pri
+++ b/configure.pri
@@ -397,16 +397,6 @@ defineTest(qtConfOutput_architecture) {
     export(QT_ARCH)
 }
 
-defineTest(qtConfOutput_verbose) {
-    !$${2}: return()
-
-    qtConfOutputVar(assign, "privatePro", "QMAKE_CONFIG_VERBOSE", true)
-
-    # export this here, so we can get verbose logging
-    QMAKE_CONFIG_VERBOSE = true
-    export(QMAKE_CONFIG_VERBOSE)
-}
-
 defineTest(qtConfOutput_styles) {
     !$${2}: return()
 
diff --git a/mkspecs/features/qt_configure.prf b/mkspecs/features/qt_configure.prf
index c4f24cddd8..6f4b608f82 100644
--- a/mkspecs/features/qt_configure.prf
+++ b/mkspecs/features/qt_configure.prf
@@ -173,6 +173,13 @@ defineTest(qtConfParseCommandLine) {
         c = $$qtConfGetNextCommandlineArg()
         isEmpty(c): break()
 
+        # handle options to turn on verbose logging
+        contains(c, "^-v")|contains(c, "^--?verbose") {
+            QMAKE_CONFIG_VERBOSE = true
+            export(QMAKE_CONFIG_VERBOSE)
+            next()
+        }
+
         # parse out opt and val
         contains(c, "^--?enable-(.*)") {
             opt = $$replace(c, "^--?enable-(.*)", "\\1")
-- 
cgit v1.2.3