summaryrefslogtreecommitdiffstats
path: root/configure.json
diff options
context:
space:
mode:
authorOswald Buddenhagen <oswald.buddenhagen@qt.io>2016-12-15 16:20:27 +0100
committerOswald Buddenhagen <oswald.buddenhagen@qt.io>2016-12-23 13:44:50 +0000
commit1b5271f27f7d5c6f814567d6d3bf211b41244cc8 (patch)
tree434e93465f8fd362b22c947e10b748171a001df2 /configure.json
parentd0db09681fc12082d717f3af88175775e0fa18fb (diff)
determine compiler version at build time, not in configure
this makes it consistent with the determination of the default include/library paths. this makes sense, as it's possible to switch the sdk/toolchain after building qt (within reason). a side effect of this change is that for compilers which emulate other compilers, both the real and the emulated version are now made available. Change-Id: Icfcc672c0d2e3d1b5e622993c366063d70ad327c Started-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'configure.json')
-rw-r--r--configure.json10
1 files changed, 0 insertions, 10 deletions
diff --git a/configure.json b/configure.json
index 1886f4074e..7d675c02be 100644
--- a/configure.json
+++ b/configure.json
@@ -253,11 +253,6 @@
"type": "compile",
"test": "common/c++98default"
},
- "compiler": {
- "label": "Compiler",
- "type": "checkCompiler",
- "log": "compilerDescription"
- },
"precompile_header": {
"label": "precompiled header support",
"type": "compile",
@@ -684,11 +679,6 @@
"condition": "features.c++14 && tests.c++1z",
"output": [ "publicFeature", "publicQtConfig" ]
},
- "compiler": {
- "label": "Compiler version",
- "condition": "tests.compiler",
- "output": [ "compilerVersion" ]
- },
"precompile_header": {
"label": "Using precompiled headers",
"condition": "config.msvc || tests.precompile_header",