aboutsummaryrefslogtreecommitdiffstats
path: root/src/libs/cplusplus
diff options
context:
space:
mode:
authorFrancois Ferrand <[email protected]>2016-02-26 18:48:39 +0100
committerFrancois Ferrand <[email protected]>2016-08-23 12:35:04 +0000
commit7b2c09a1186f2cf69f276017ba08da89560f55be (patch)
treee336ae35ba2779b4051d1fcdfb9003b40792b88a /src/libs/cplusplus
parent285c8a7543aae0d71949451f04c99a4924900104 (diff)
C++: Disable C++ keywords in C files
In some (legacy) C files, new and delete may be used for regular identifier. There are some limitations: * Header files have no 'implicit' type, and may be parsed as C++ or ObjC depending on the other files in the project. * QMakeProject use a single ProjectPart for C and C++ files, so there will still be the issue. Change-Id: Iec11687b35f7ccf1e7c0d091b143ae90d950e440 Reviewed-by: Nikolai Kosjar <[email protected]>
Diffstat (limited to 'src/libs/cplusplus')
-rw-r--r--src/libs/cplusplus/MatchingText.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/libs/cplusplus/MatchingText.cpp b/src/libs/cplusplus/MatchingText.cpp
index 08ea34c9182..86b37c97c7b 100644
--- a/src/libs/cplusplus/MatchingText.cpp
+++ b/src/libs/cplusplus/MatchingText.cpp
@@ -201,6 +201,7 @@ static Tokens getTokens(const QTextCursor &cursor, int &prevState)
features.qtKeywordsEnabled = false;
features.qtMocRunEnabled = false;
features.cxx11Enabled = true;
+ features.cxxEnabled = true;
features.c99Enabled = true;
SimpleLexer tokenize;