From 997eb98eb2b8b154b0745a97438fa937bf0d26bf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thorbj=C3=B8rn=20Lindeijer?= <bjorn@lindeijer.nl>
Date: Wed, 28 May 2014 00:04:13 +0200
Subject: [PATCH] GenericProject: Changed the way C++11 is specified

Pass it as compiler flag, which makes sure that not only cxxVersion
is set correctly (depending on the compiler) but that also the
toolchainDefines are the right ones for C++11 (most significantly,
the value of __cplusplus which affects STL features).

Change-Id: I53dd543b30b7fc2824283ec119d7d5261f50f130
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
---
 src/plugins/genericprojectmanager/genericproject.cpp | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/plugins/genericprojectmanager/genericproject.cpp b/src/plugins/genericprojectmanager/genericproject.cpp
index b824aaf4131..4fe7138c83f 100644
--- a/src/plugins/genericprojectmanager/genericproject.cpp
+++ b/src/plugins/genericprojectmanager/genericproject.cpp
@@ -252,12 +252,14 @@ void GenericProject::refresh(RefreshOptions options)
 
         Kit *k = activeTarget() ? activeTarget()->kit() : KitManager::defaultKit();
         if (ToolChain *tc = ToolChainKitInformation::toolChain(k)) {
-            QStringList cxxflags; // FIXME: Can we do better?
-            part->evaluateToolchain(tc, cxxflags, cxxflags,
+            QStringList cflags;
+            QStringList cxxflags;
+            cxxflags << QLatin1String("-std=c++11");
+
+            part->evaluateToolchain(tc, cxxflags, cflags,
                                     SysRootKitInformation::sysRoot(k));
         }
 
-        part->cxxVersion = CppTools::ProjectPart::CXX11; // assume C++11
         part->projectConfigFile = configFileName();
 
         // ### add _defines.