diff options
| author | Nikolai Kosjar <nikolai.kosjar@qt.io> | 2017-05-16 16:07:55 +0200 |
|---|---|---|
| committer | Nikolai Kosjar <nikolai.kosjar@qt.io> | 2017-05-16 14:10:39 +0000 |
| commit | 9cb02d16639319fe0d1a4514a54508dda4ecf12b (patch) | |
| tree | c0148cfbd26ed4857c29241d1fa3ff1aac8076dc /src/plugins/cppeditor/cpphighlighter.cpp | |
| parent | 837cb2e3974b4b8d157be8234adcd11b226a7caf (diff) | |
CppEditor: Fix condition for Obj-C keyword highlighting
Change-Id: I3fb8bf46fffbb0b41ef532996a21f03d2d48a9c1
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
Diffstat (limited to 'src/plugins/cppeditor/cpphighlighter.cpp')
| -rw-r--r-- | src/plugins/cppeditor/cpphighlighter.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/cppeditor/cpphighlighter.cpp b/src/plugins/cppeditor/cpphighlighter.cpp index f5d7f104f4..571d7ab9b1 100644 --- a/src/plugins/cppeditor/cpphighlighter.cpp +++ b/src/plugins/cppeditor/cpphighlighter.cpp @@ -210,7 +210,7 @@ void CppHighlighter::highlightBlock(const QString &text) } else if (tk.isKeyword() || (m_languageFeatures.qtKeywordsEnabled && CppTools::isQtKeyword(text.midRef(tk.utf16charsBegin(), tk.utf16chars()))) - || tk.isObjCAtKeyword()) { + || (m_languageFeatures.objCEnabled && tk.isObjCAtKeyword())) { setFormat(tk.utf16charsBegin(), tk.utf16chars(), formatForCategory(CppKeywordFormat)); } else if (tk.isPrimitiveType()) { setFormat(tk.utf16charsBegin(), tk.utf16chars(), |