feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Fix generic highlighter autotest

Browse Source 
Change-Id: I35994a8c29374edfeb8a230af10c2a3277232f22
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
This commit is contained in:
jkobus
2013-08-30 13:28:49 +02:00
committed by Jarek Kobus
parent 513b884dfc
commit 86f9a2b7e6
14 changed files with 144 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/plugins/texteditor/plaintexteditor.cpp
View File

@@ -38,6 +38,7 @@
#include "manager.h"
#include "context.h"
#include "normalindenter.h"
#include "generichighlighter/highlighterutils.h"
#include <coreplugin/coreconstants.h>
#include <coreplugin/icore.h>
@@ -125,13 +126,13 @@ void PlainTextEditorWidget::configure(const Core::MimeType &mimeType)
if (!mimeType.isNull()) {
m_isMissingSyntaxDefinition = true;
highlighter->setMimeType(mimeType);
setMimeTypeForHighlighter(highlighter, mimeType);
const QString &type = mimeType.type();
setMimeType(type);
QString definitionId = Manager::instance()->definitionIdByMimeType(type);
if (definitionId.isEmpty())
definitionId = Highlighter::findDefinitionId(mimeType, true);
definitionId = findDefinitionId(mimeType, true);
if (!definitionId.isEmpty()) {
m_isMissingSyntaxDefinition = false;