aboutsummaryrefslogtreecommitdiffstats
path: root/tests/auto/blackbox/testdata/cxx-language-version
diff options
context:
space:
mode:
authorChristian Kandeler <christian.kandeler@qt.io>2018-02-06 11:06:12 +0100
committerChristian Kandeler <christian.kandeler@qt.io>2018-02-07 08:48:25 +0000
commitccb0c77077d406573b37f88bfa985528e674639e (patch)
treea8264ce4231334725b51edac4e75a22e6f560ebc /tests/auto/blackbox/testdata/cxx-language-version
parentebc12dec06f9925eb02f2f4c0cbfde2c99427eb1 (diff)
Officially provide "c++17" as possible value for cpp.cxxLanguageVersion
The standard is out now. Task-number: QBS-1020 Change-Id: Ie8249e1c860d5ebc2f9dadf02551544ddaaf2868 Reviewed-by: Jake Petroules <jake.petroules@qt.io>
Diffstat (limited to 'tests/auto/blackbox/testdata/cxx-language-version')
-rw-r--r--tests/auto/blackbox/testdata/cxx-language-version/cxx-language-version.qbs4
1 files changed, 4 insertions, 0 deletions
diff --git a/tests/auto/blackbox/testdata/cxx-language-version/cxx-language-version.qbs b/tests/auto/blackbox/testdata/cxx-language-version/cxx-language-version.qbs
index 436c64c5e..e0301eee1 100644
--- a/tests/auto/blackbox/testdata/cxx-language-version/cxx-language-version.qbs
+++ b/tests/auto/blackbox/testdata/cxx-language-version/cxx-language-version.qbs
@@ -12,9 +12,12 @@ CppApplication {
configure: {
var isNewerMsvc;
+ var isEvenNewerMsvc;
var isOlderMsvc;
var isGcc;
if (toolchain.contains("msvc")) {
+ if (compilerVersion >= "19.12.25831")
+ isEvenNewerMsvc = true;
if (compilerVersion >= "18.00.30723")
isNewerMsvc = true;
else
@@ -23,6 +26,7 @@ CppApplication {
isGcc = true;
}
console.info("is newer MSVC: " + isNewerMsvc);
+ console.info("is even newer MSVC: " + isEvenNewerMsvc);
console.info("is older MSVC: " + isOlderMsvc);
console.info("is GCC: " + isGcc);
}