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

GLSLEditor: Fix crash when GLSL highligher is used inside diff editor.

Browse Source 
Task-number: QTCREATORBUG-10671

Change-Id: Ife5b1a5f2ec42ddaa1e1bc4ac1a953f34efd0d1a
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
This commit is contained in:
David Schulz
2013-11-12 13:33:01 +01:00
parent 9509386a8d
commit 80819b3de7
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/plugins/glsleditor/glslhighlighter.cpp
View File

@@ -92,8 +92,9 @@ void Highlighter::highlightBlock(const QString &text)
lex.setState(state); lex.setState(state);
lex.setScanKeywords(false); lex.setScanKeywords(false);
lex.setScanComments(true); lex.setScanComments(true);
const int variant = const int variant = GLSLTextEditorWidget::languageVariant(parent()
GLSLTextEditorWidget::languageVariant(static_cast<BaseTextDocument*>(parent())->mimeType()); ? static_cast<BaseTextDocument*>(parent())->mimeType()
: QString());
lex.setVariant(variant); lex.setVariant(variant);
int initialState = state; int initialState = state;