From 8185fe84a6a55fa387752ad30948c936559e290c Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Fri, 22 Jul 2016 11:05:39 +0200 Subject: [PATCH] fix up detection code for compiler defaulting to c++98 - remove the unconditional CONFIG+=c++11 from default_pre.prf, so the change actually has any effect - fix up the description fields somewhat this amends 091df96fb8, which was rushed in without maintainer review. Change-Id: I88b859d6e2f0fe3d6a4771afe464a7c445e7b47b Reviewed-by: Lars Knoll --- configure.json | 4 ++-- mkspecs/features/default_pre.prf | 2 -- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/configure.json b/configure.json index 94514b1869..100841ddd2 100644 --- a/configure.json +++ b/configure.json @@ -823,7 +823,7 @@ "test": "common/c++1z" }, "cxx98default": { - "description": "compilers defaulting to C++98", + "description": "compiler defaulting to C++98", "type": "compile", "test": "common/c++98default" }, @@ -1260,7 +1260,7 @@ "output": [ "publicConfig", "privateConfig" ] }, "cxx98default": { - "description": "Compilers defaulting to C++98", + "description": "Compiler defaults to C++98", "condition": "tests.cxx98default", "output": [ { "type": "publicConfig", "name": "c++11" } ] }, diff --git a/mkspecs/features/default_pre.prf b/mkspecs/features/default_pre.prf index 8841dc19f2..b655f2e0ca 100644 --- a/mkspecs/features/default_pre.prf +++ b/mkspecs/features/default_pre.prf @@ -8,8 +8,6 @@ CONFIG = \ testcase_targets import_plugins import_qpa_plugin \ $$CONFIG -CONFIG += c++11 - !build_pass:defined(QT_EDITION, var):!equals(QT_EDITION, "OpenSource"):!equals(QT_EDITION, "Preview") { # # call license checker (but cache result for one day)