summaryrefslogtreecommitdiff
path: root/src/plugins/diffeditor/diffeditorwidget.cpp
diff options
context:
space:
mode:
authorjkobus <jaroslaw.kobus@digia.com>2013-09-13 12:13:10 +0200
committerChristian Stenger <christian.stenger@digia.com>2013-09-18 17:25:41 +0200
commit5d15076ea14262b474dd60768e6d80ef498cfdd1 (patch)
treeacb14dbe24ed5de2f08baa021ea566571aa7a58f /src/plugins/diffeditor/diffeditorwidget.cpp
parent8e62876f642901ba12121e6699b35986ff9595b5 (diff)
downloadqt-creator-5d15076ea14262b474dd60768e6d80ef498cfdd1.tar.gz
Fix compilation of generichighlighter test on Windows
Change-Id: I25c2f68528ede12fa900ea86973c6df39667c421 Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com> Reviewed-by: Christian Stenger <christian.stenger@digia.com>
Diffstat (limited to 'src/plugins/diffeditor/diffeditorwidget.cpp')
-rw-r--r--src/plugins/diffeditor/diffeditorwidget.cpp7
1 files changed, 2 insertions, 5 deletions
diff --git a/src/plugins/diffeditor/diffeditorwidget.cpp b/src/plugins/diffeditor/diffeditorwidget.cpp
index 8c0c43b570..4960b19263 100644
--- a/src/plugins/diffeditor/diffeditorwidget.cpp
+++ b/src/plugins/diffeditor/diffeditorwidget.cpp
@@ -45,8 +45,7 @@
#include <texteditor/texteditorsettings.h>
#include <texteditor/fontsettings.h>
#include <texteditor/displaysettings.h>
-#include <texteditor/generichighlighter/highlighter.h>
-#include <texteditor/generichighlighter/highlighterutils.h>
+#include <texteditor/highlighterutils.h>
#include <coreplugin/icore.h>
#include <coreplugin/minisplitter.h>
@@ -278,9 +277,7 @@ void MultiHighlighter::setDocuments(const QList<QPair<DiffEditorWidget::DiffFile
highlighter->setDocument(document);
}
if (!highlighter) {
- TextEditor::Highlighter *h = new TextEditor::Highlighter();
- highlighter = h;
- setMimeTypeForHighlighter(h, mimeType);
+ highlighter = createGenericSyntaxHighlighter(mimeType);
highlighter->setDocument(document);
}
m_documents.append(document);