diff options
| author | Lars Knoll <lars.knoll@qt.io> | 2016-07-14 13:12:14 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@qt.io> | 2016-07-15 10:11:01 +0000 |
| commit | 091df96fb8da356dc9de81dc390f55e66d4d7c01 (patch) | |
| tree | 0ee5f6907904705db162bd27090fa13321f050e2 /configure.json | |
| parent | 8ee2a659d6170ebe57b75367ef8bf48e0ab4fdfd (diff) | |
Reimplement compiler default detection
Change d1b09dba45c4b3ee0f31cd9bbf6941f17afd48f0 removed the
support to detect the C++ version the compiler used by
default. In essence, it forced the compiler in C++11 mode,
if the default was still C++98.
This change reimplements the functionality in the new
configuration system.
Change-Id: Ib4bf7ade85288776f9ae2a870f19764df727e0a5
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'configure.json')
| -rw-r--r-- | configure.json | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/configure.json b/configure.json index 432670806e..5cc3d65b8e 100644 --- a/configure.json +++ b/configure.json @@ -238,6 +238,11 @@ "type": "compile", "test": "common/c++1z" }, + "cxx98default": { + "description": "compilers defaulting to C++98", + "type": "compile", + "test": "common/c++98default" + }, "compiler": { "description": "Compiler", "type": "checkCompiler", @@ -966,6 +971,11 @@ "condition": "call.crossCompile", "output": [ "publicConfig", "privateConfig" ] }, + "cxx98default": { + "description": "Compilers defaulting to C++98", + "condition": "tests.cxx98default", + "output": [ { "type": "publicConfig", "name": "c++11" } ] + }, "compiler-flags": { "output": [ "compilerFlags" ], "priority": -3 |