diff options
| author | Eike Ziller <eike.ziller@theqtcompany.com> | 2015-01-08 10:38:20 +0100 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@theqtcompany.com> | 2015-01-08 10:38:20 +0100 |
| commit | b5b47f7df2a70064f5e1041cefb18636d20d0bd4 (patch) | |
| tree | 7f57b886355129a7dd13611787b7de96065dde3a /src/plugins/cmakeprojectmanager | |
| parent | 0a5186700c036a541f5fa0baebb5e9ce0d506fed (diff) | |
| parent | ecd9c4c813be37dec46514462f1fcba901165a93 (diff) | |
| download | qt-creator-b5b47f7df2a70064f5e1041cefb18636d20d0bd4.tar.gz | |
Merge remote-tracking branch 'origin/3.3'
Conflicts:
src/plugins/cppeditor/cppdocumentationcommenthelper.cpp
Change-Id: I2cf25eba1de149765a6c44ad354d606ce9de512d
Diffstat (limited to 'src/plugins/cmakeprojectmanager')
| -rw-r--r-- | src/plugins/cmakeprojectmanager/cmakeeditor.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/cmakeprojectmanager/cmakeeditor.cpp b/src/plugins/cmakeprojectmanager/cmakeeditor.cpp index 873c5b5deb..fa19445743 100644 --- a/src/plugins/cmakeprojectmanager/cmakeeditor.cpp +++ b/src/plugins/cmakeprojectmanager/cmakeeditor.cpp @@ -276,7 +276,7 @@ CMakeEditorFactory::CMakeEditorFactory(CMakeSettingsPage *settingsPage) setEditorCreator([]() { return new CMakeEditor; }); setEditorWidgetCreator([]() { return new CMakeEditorWidget; }); setDocumentCreator([]() { return new CMakeDocument; }); - setGenericSyntaxHighlighter(QLatin1String(Constants::CMAKEMIMETYPE)); + setGenericSyntaxHighlighterByName(QLatin1String("CMake")); setCommentStyle(Utils::CommentDefinition::HashStyle); setCodeFoldingSupported(true); |