diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2016-11-02 16:50:04 +0100 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2016-11-07 13:02:06 +0000 |
| commit | 4b1115742ac7be1a1c6bce0e9cac022adc0bdc5c (patch) | |
| tree | 782129d765faf7941bd1acb9d37d89453d4be366 | |
| parent | 66ad9668f3158ab5a0ee8f93fe3ddf062e37967e (diff) | |
invert the logic of the c++98 default test
this is much more intuitive, and actually produces a sensible result
with configure -recheck after a compiler upgrade.
Change-Id: Icfa0b85377d9fc014e66490c8ebf6c9236df978e
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
| -rw-r--r-- | config.tests/common/c++98default/c++98default.cpp | 4 | ||||
| -rw-r--r-- | configure.json | 10 |
2 files changed, 7 insertions, 7 deletions
diff --git a/config.tests/common/c++98default/c++98default.cpp b/config.tests/common/c++98default/c++98default.cpp index 5edcf2d76c..3ff92eda33 100644 --- a/config.tests/common/c++98default/c++98default.cpp +++ b/config.tests/common/c++98default/c++98default.cpp @@ -37,8 +37,8 @@ ** ****************************************************************************/ -#if __cplusplus >= 201103L -#error "compiler uses c++11 or higher by default" +#if __cplusplus < 201103L +#error "compiler does not use c++11 or higher by default" #endif int main(int, char **) {} diff --git a/configure.json b/configure.json index 85ef23a186..0ff808519c 100644 --- a/configure.json +++ b/configure.json @@ -281,8 +281,8 @@ "type": "compile", "test": "common/c++1z" }, - "cxx98default": { - "label": "compiler defaulting to C++98", + "cxx11default": { + "label": "compiler defaulting to C++11 or higher", "type": "compile", "test": "common/c++98default" }, @@ -483,9 +483,9 @@ "condition": "call.crossCompile", "output": [ "publicConfig", "privateConfig" ] }, - "cxx98default": { - "label": "Compiler defaults to C++98", - "condition": "tests.cxx98default", + "cxx11default": { + "label": "Compiler defaults to C++11 or higher", + "condition": "!tests.cxx11default", "output": [ { "type": "publicConfig", "name": "c++11" } ] }, "compiler-flags": { |