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

Revert "QmlDesigner: Use generic signaling from project"

Browse Source 
The code that this depends on is not there yet.

This reverts commit e6f0695751.

Change-Id: I61d4ff735342731a781960b19b047613b58a23b5
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
This commit is contained in:
Tobias Hunger
2016-06-13 12:40:54 +00:00
committed by Tim Jenssen
parent b6a6796d5b
commit 98192159da
1 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/plugins/qmldesigner/components/integration/designdocument.cpp
View File

@@ -644,7 +644,7 @@ static inline Kit *getActiveKit(DesignDocument *designDocument)
QObject::connect(ProjectTree::instance(), &ProjectTree::currentProjectChanged, QObject::connect(ProjectTree::instance(), &ProjectTree::currentProjectChanged,
designDocument, &DesignDocument::updateActiveQtVersion, Qt::UniqueConnection); designDocument, &DesignDocument::updateActiveQtVersion, Qt::UniqueConnection);
QObject::connect(currentProject, &Project::activeProjectConfigurationChanged, QObject::connect(currentProject, &Project::activeTargetChanged,
designDocument, &DesignDocument::updateActiveQtVersion, Qt::UniqueConnection); designDocument, &DesignDocument::updateActiveQtVersion, Qt::UniqueConnection);
@@ -663,10 +663,7 @@ static inline Kit *getActiveKit(DesignDocument *designDocument)
void DesignDocument::updateActiveQtVersion() void DesignDocument::updateActiveQtVersion()
{ {
Kit *k = getActiveKit(this); m_currentKit = getActiveKit(this);
if (k == m_currentKit)
return;
m_currentKit = k;
viewManager().setNodeInstanceViewKit(m_currentKit); viewManager().setNodeInstanceViewKit(m_currentKit);
} }