path: root/configure.json
diff options
authorOswald Buddenhagen <>2016-07-06 13:58:53 +0200
committerOswald Buddenhagen <>2016-08-18 17:10:25 +0000
commitfd3e12e7a6c71a244650415a86e98d910a011ebe (patch)
tree4b060b69d7cf683d477c731a01dd27fc4cb4ef46 /configure.json
parent9172143f52757c29fbcf1a5f30d5ca25c52efb81 (diff)
replace mechanism to override variables from the mkspecs
it is sometimes desirable to override values from the mkspec without modifying (or wrapping) the spec itself. linux distributors do this on a regular basis. so far, we'd pick up CFLAGS, etc. from the environment, in a somewhat autoconf-like fashion. however, over time, this approach proved problematic: the concept doesn't mix particularly well with mkspecs to start with, is unexpected (and therefore causes frustration), and doesn't mix well with cross-building (at least the way it was realized). ironically, it was implemented this way (quite a while ago) upon my explicit request ... the new mechanism uses explicit variable manipulations on the configure command line, just like qmake itself understands. as it happens, this is again quite similar to autoconf-generated configure scripts. however, this time around we don't pretend to be actually autoconf-like, so we also don't try to map any variable names (some of which have different semantics anyway). this commit also eliminates the last use of the QMakeVar() function, so delete it and the underlying infrastructure. Task-number: QTBUG-32530 Task-number: QTBUG-42962 Change-Id: Id31a6b80e1add08ca21f5b178614bda530d12374 Reviewed-by: Lars Knoll <>
Diffstat (limited to 'configure.json')
1 files changed, 6 insertions, 1 deletions
diff --git a/configure.json b/configure.json
index 29cbacc89d..2b56279b27 100644
--- a/configure.json
+++ b/configure.json
@@ -17,6 +17,7 @@
"SYBASE_LIBS": "tds.libs",
"ZLIB_LIBS": "zlib.libs"
+ "custom": "qmakeArgs",
"options": {
"prefix": "string",
"hostprefix": "string",
@@ -762,7 +763,7 @@
"testTypeDependencies": {
"linkerSupportsFlag": [ "use_gold_linker" ],
- "compile": [ "shared", "use_gold_linker", "compiler-flags", "gcc-sysroot" ],
+ "compile": [ "shared", "use_gold_linker", "compiler-flags", "gcc-sysroot", "qmakeargs" ],
"detectPkgConfig": [ "cross_compile" ],
"library": [ "pkg-config" ],
"getPkgConfigVariable": [ "pkg-config" ],
@@ -1229,6 +1230,10 @@
"output": [ "gccSysroot" ],
"condition": "input.sysroot != ''"
+ "qmakeargs": {
+ "output": [ "qmakeArgs" ],
+ "condition": "input.qmakeArgs != ''"
+ },
"use_gold_linker": {
"description": "Using gold linker",
"condition": "tests.use_gold_linker",