AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix handling of -v/-verbose command line flags to configure

Browse Source 
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>
This commit is contained in:
Lars Knoll 2016-06-29 15:02:35 +02:00
parent 3114237877
commit c167308c5d
3 changed files with 7 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
configure.json
View File

@ -169,8 +169,6 @@
"testcocoon": "boolean", "testcocoon": "boolean",
"tslib": "boolean", "tslib": "boolean",
"use-gold-linker": { "type": "boolean", "name": "use_gold_linker" }, "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" }, "warnings-are-errors": { "type": "boolean", "name": "warnings_are_errors" },
"Werror": { "type": "boolean", "name": "warnings_are_errors" }, "Werror": { "type": "boolean", "name": "warnings_are_errors" },
"widgets": "boolean", "widgets": "boolean",
@ -943,13 +941,6 @@
}, },
"features": { "features": {
"verbose": {
"description": "Verbose configure output",
"autoDetect": false,
"output": [ "verbose" ],
"priority": -4
},
"shared": { "shared": {
"description": "Building shared libraries", "description": "Building shared libraries",
"condition": "!config.ios && !config.integrity", "condition": "!config.ios && !config.integrity",

10
configure.pri
View File

@ -397,16 +397,6 @@ defineTest(qtConfOutput_architecture) {
export(QT_ARCH) 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) { defineTest(qtConfOutput_styles) {
!$${2}: return() !$${2}: return()

7
mkspecs/features/qt_configure.prf
View File

@ -173,6 +173,13 @@ defineTest(qtConfParseCommandLine) {
c = $$qtConfGetNextCommandlineArg() c = $$qtConfGetNextCommandlineArg()
isEmpty(c): break() 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 # parse out opt and val
contains(c, "^--?enable-(.*)") { contains(c, "^--?enable-(.*)") {
opt = $$replace(c, "^--?enable-(.*)", "\\1") opt = $$replace(c, "^--?enable-(.*)", "\\1")