diff options
| author | Kai Koehne <kai.koehne@theqtcompany.com> | 2014-12-03 13:30:37 +0100 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@theqtcompany.com> | 2014-12-04 07:53:46 +0100 |
| commit | 90bad9b13906f1ac73e040813ab027cba5119260 (patch) | |
| tree | db564a89d4a2931bc6d004d1c4770f6c539648fa | |
| parent | 0dfb84da9e79d9f367f6e9cb08d8e031d7ede001 (diff) | |
| download | qt-creator-90bad9b13906f1ac73e040813ab027cba5119260.tar.gz | |
QmlProject: Reevaluate QML info after initial setup
We're setting up targets only after the initial refresh(Everything),
so we need to reconfigure the project after that. This fixes issues
where the QML editor still uses Qt Quick 1 imports from the default
Qt kit when a project is initially loaded.
Change-Id: I15af4a1b90231632303d2fd73db350a9d2aff0ce
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@theqtcompany.com>
| -rw-r--r-- | src/plugins/qmlprojectmanager/qmlproject.cpp | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/plugins/qmlprojectmanager/qmlproject.cpp b/src/plugins/qmlprojectmanager/qmlproject.cpp index a324322e0d..439a6ec3db 100644 --- a/src/plugins/qmlprojectmanager/qmlproject.cpp +++ b/src/plugins/qmlprojectmanager/qmlproject.cpp @@ -403,10 +403,7 @@ bool QmlProject::fromMap(const QVariantMap &map) connect(this, SIGNAL(activeTargetChanged(ProjectExplorer::Target*)), this, SLOT(onActiveTargetChanged(ProjectExplorer::Target*))); - // make sure we get updates on kit changes - m_activeTarget = activeTarget(); - if (m_activeTarget) - connect(m_activeTarget, SIGNAL(kitChanged()), this, SLOT(onKitChanged())); + onActiveTargetChanged(activeTarget()); return true; } |