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

Merge remote-tracking branch 'origin/2.4'

Browse Source 
Conflicts:
	qtcreator.pri
	share/qtcreator/templates/qtquickapp/main.cpp
	src/plugins/analyzerbase/analyzermanager.cpp
	src/plugins/qmlprofiler/qmlprofilertool.cpp

Change-Id: I3be78f22e7301d61a9c7fc142cbc34a3cebc2cf4
This commit is contained in:
Eike Ziller
2011-11-18 10:16:49 +01:00
parent 826354e3da a8a170a4d4
commit fbd47e25ee
93 changed files with 4807 additions and 1775 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -634,6 +634,8 @@ void CPPEditorWidget::abortRename()
m_currentRenameSelectionBegin = QTextCursor();
m_currentRenameSelectionEnd = QTextCursor();
setExtraSelections(CodeSemanticsSelection, m_renameSelections);
semanticRehighlight(/* force = */ true);
}
void CPPEditorWidget::onDocumentUpdated(Document::Ptr doc)
@@ -2133,7 +2135,7 @@ TextEditor::IAssistInterface *CPPEditorWidget::createAssistInterface(
includePaths,
frameworkPaths);
} else if (kind == TextEditor::QuickFix) {
if (!semanticInfo().doc || semanticInfo().revision != editorRevision())
if (!semanticInfo().doc || isOutdated())
return 0;
return new CppQuickFixAssistInterface(const_cast<CPPEditorWidget *>(this), reason);
}