aboutsummaryrefslogtreecommitdiffstats
path: root/src/plugins/cpptools/projectpart.cpp
diff options
context:
space:
mode:
authorOrgad Shaneh <orgad.shaneh@audiocodes.com>2017-11-23 16:11:07 +0200
committerOrgad Shaneh <orgads@gmail.com>2017-11-24 08:43:27 +0000
commitb43e22b8f40ad19ead26c6e9c1d2f3ca070afd06 (patch)
tree46da986c68f77046c7912e7c5757cd02a3a5ea29 /src/plugins/cpptools/projectpart.cpp
parentec86bf8ca61c3afff9922a0f7c4751bd68e31357 (diff)
CppTools: Disable Qt keywords for C files
Task-number: QTCREATORBUG-1478 Change-Id: I29afc0f38e5f86ca2c30d5b6551974df68ee7512 Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
Diffstat (limited to 'src/plugins/cpptools/projectpart.cpp')
-rw-r--r--src/plugins/cpptools/projectpart.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/plugins/cpptools/projectpart.cpp b/src/plugins/cpptools/projectpart.cpp
index e77e079c808..4dc871e87ea 100644
--- a/src/plugins/cpptools/projectpart.cpp
+++ b/src/plugins/cpptools/projectpart.cpp
@@ -35,9 +35,10 @@ namespace CppTools {
void ProjectPart::updateLanguageFeatures()
{
- const bool hasQt = qtVersion != NoQt;
+ const bool hasCxx = languageVersion >= CXX98;
+ const bool hasQt = hasCxx && qtVersion != NoQt;
languageFeatures.cxx11Enabled = languageVersion >= CXX11;
- languageFeatures.cxxEnabled = languageVersion >= CXX98;
+ languageFeatures.cxxEnabled = hasCxx;
languageFeatures.c99Enabled = languageVersion >= C99;
languageFeatures.objCEnabled = languageExtensions.testFlag(ObjectiveCExtensions);
languageFeatures.qtEnabled = hasQt;