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

Merge remote-tracking branch 'origin/3.0'

Browse Source 
Conflicts:
	qtcreator.pri
	qtcreator.qbs

Change-Id: I91b9ceba836d01086e9ccdb4499436d17195b729
This commit is contained in:
Eike Ziller
2013-11-06 14:02:08 +01:00
parent f85c200244 fbd3f73594
commit 49b7e95e7f
358 changed files with 3130 additions and 107477 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/plugins/qmlprojectmanager/qmlproject.cpp
View File

@@ -108,7 +108,8 @@ QmlProject::QmlProject(Internal::Manager *manager, const QString &fileName)
: m_manager(manager),
m_fileName(fileName),
m_defaultImport(UnknownImport),
m_modelManager(QmlJS::ModelManagerInterface::instance())
m_modelManager(QmlJS::ModelManagerInterface::instance()),
m_activeTarget(0)
{
setId("QmlProjectManager.QmlProject");
setProjectContext(Context(QmlProjectManager::Constants::PROJECTCONTEXT));
@@ -143,7 +144,19 @@ void QmlProject::addedTarget(ProjectExplorer::Target *target)
addedRunConfiguration(rc);
}
void QmlProject::onActiveTargetChanged(ProjectExplorer::Target * /*target*/)
void QmlProject::onActiveTargetChanged(ProjectExplorer::Target *target)
{
if (m_activeTarget)
disconnect(m_activeTarget, SIGNAL(kitChanged()), this, SLOT(onKitChanged()));
m_activeTarget = target;
if (m_activeTarget)
connect(target, SIGNAL(kitChanged()), this, SLOT(onKitChanged()));
// make sure e.g. the default qml imports are adapted
refresh(Configuration);
}
void QmlProject::onKitChanged()
{
// make sure e.g. the default qml imports are adapted
refresh(Configuration);
@@ -398,6 +411,11 @@ 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()));
return true;
}