diff options
| author | Francois Ferrand <thetypz@gmail.com> | 2016-09-12 13:42:42 +0200 |
|---|---|---|
| committer | Francois Ferrand <thetypz@gmail.com> | 2016-12-05 10:27:58 +0000 |
| commit | 38ae5aec1055e4dea2db5f1f9c9ec3b5ae618265 (patch) | |
| tree | 9a11846470090fee7ba2a309f00bdd6d2e8f1da0 /src/plugins/cppeditor/cpphighlighter.cpp | |
| parent | 8f0ddff1ccb402d8fdc68ec0612920547d12876a (diff) | |
C++: Fix handling of Objective-C/C++
- Objective C/C++ was not enabled in highlighter.
- QMake project part for Objective C/C++ did not have ObjectiveC extension enabled.
- As languageFeatures.objCEnabled is a bitfield, it was actually always set to 0.
- Highlight ObjC class & protocol declarations.
- Highlight ObjC message passing.
Change-Id: I64d12c9509058d05f7adce94598cb7ce91727ac8
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
Diffstat (limited to 'src/plugins/cppeditor/cpphighlighter.cpp')
| -rw-r--r-- | src/plugins/cppeditor/cpphighlighter.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/plugins/cppeditor/cpphighlighter.cpp b/src/plugins/cppeditor/cpphighlighter.cpp index d754b32686..1912f30ff1 100644 --- a/src/plugins/cppeditor/cpphighlighter.cpp +++ b/src/plugins/cppeditor/cpphighlighter.cpp @@ -75,6 +75,7 @@ void CppHighlighter::highlightBlock(const QString &text) features.cxx11Enabled = true; features.cxxEnabled = true; features.c99Enabled = true; + features.objCEnabled = true; SimpleLexer tokenize; tokenize.setLanguageFeatures(features); |