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

Disabled the semantic highlighter when using Qt 4.7.0.

Browse Source
This commit is contained in:
Roberto Raggi
2010-09-29 12:14:19 +02:00
parent 6fabd1b237
commit 32fff3f6cd
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/plugins/cppeditor/cppeditor.cpp
View File

@@ -102,6 +102,10 @@ enum {
using namespace CPlusPlus; using namespace CPlusPlus;
using namespace CppEditor::Internal; using namespace CppEditor::Internal;
namespace {
bool semanticHighlighterDisabled = qstrcmp(qVersion(), "4.7.0") == 0;
}
static QList<QTextEdit::ExtraSelection> createSelections(QTextDocument *document, static QList<QTextEdit::ExtraSelection> createSelections(QTextDocument *document,
const QList<CPlusPlus::Document::DiagnosticMessage> &msgs, const QList<CPlusPlus::Document::DiagnosticMessage> &msgs,
const QTextCharFormat &format) const QTextCharFormat &format)
@@ -1888,7 +1892,7 @@ void CPPEditor::updateSemanticInfo(const SemanticInfo &semanticInfo)
m_highlighter.cancel(); m_highlighter.cancel();
if (semanticInfo.doc) { if (! semanticHighlighterDisabled && semanticInfo.doc) {
if (Core::EditorManager::instance()->currentEditor() == editableInterface()) { if (Core::EditorManager::instance()->currentEditor() == editableInterface()) {
LookupContext context(semanticInfo.doc, semanticInfo.snapshot); LookupContext context(semanticInfo.doc, semanticInfo.snapshot);
CheckSymbols::Future f = CheckSymbols::go(semanticInfo.doc, context); CheckSymbols::Future f = CheckSymbols::go(semanticInfo.doc, context);