Merge remote-tracking branch 'origin/3.6'

Change-Id: Ia5e169a276e21db59b4b26a1ed3f253bff9e2ab9
This commit is contained in:
Eike Ziller
2016-01-14 09:32:11 +01:00
7 changed files with 47 additions and 6 deletions

View File

@@ -69,12 +69,11 @@ ModelManagerSupportClang::ModelManagerSupportClang()
m_instance_forTestsOnly = this;
Core::EditorManager *editorManager = Core::EditorManager::instance();
connect(editorManager, &Core::EditorManager::editorOpened,
this, &ModelManagerSupportClang::onEditorOpened);
connect(editorManager, &Core::EditorManager::currentEditorChanged,
this, &ModelManagerSupportClang::onCurrentEditorChanged,
Qt::QueuedConnection);
connect(editorManager, &Core::EditorManager::editorOpened,
this, &ModelManagerSupportClang::onEditorOpened,
Qt::QueuedConnection);
connect(editorManager, &Core::EditorManager::editorsClosed,
this, &ModelManagerSupportClang::onEditorClosed,
Qt::QueuedConnection);