Merge remote-tracking branch 'origin/3.3'

This commit is contained in:
Eike Ziller
2014-11-26 11:11:46 +01:00
39 changed files with 639 additions and 173 deletions

View File

@@ -693,8 +693,8 @@ void CppModelManager::updateVisibleEditorDocuments() const
foreach (Core::IEditor *editor, Core::EditorManager::visibleEditors()) {
if (const Core::IDocument *document = editor->document()) {
const QString filePath = document->filePath();
QTC_ASSERT(!filePath.isEmpty(), continue);
visibleDocumentsInEditMode.insert(filePath);
if (!filePath.isEmpty())
visibleDocumentsInEditMode.insert(filePath);
}
}