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

Merge remote-tracking branch 'gerrit/2.6'

Browse Source 
Conflicts:
	src/libs/utils/environment.cpp
	src/plugins/android/androidtoolchain.cpp
	src/plugins/projectexplorer/gcctoolchain.cpp
	src/plugins/qt4projectmanager/qt4buildconfiguration.cpp
	src/plugins/qtsupport/baseqtversion.cpp
	src/shared/proparser/qmakeevaluator.cpp

Change-Id: I554e96445a4d2b9ba0cc173ecd766091ee921aa2
This commit is contained in:
Oswald Buddenhagen
2012-09-12 17:27:37 +02:00
parent c12cefbb51 77a6b71f72
commit e730e2bb8a
93 changed files with 880 additions and 690 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/plugins/projectexplorer/target.cpp
View File

@@ -119,21 +119,21 @@ QList<DeployConfigurationFactory *> TargetPrivate::deployFactories() const
return ExtensionSystem::PluginManager::getObjects<DeployConfigurationFactory>();
}
Target::Target(Project *project, Kit *p) :
ProjectConfiguration(project, p->id()),
Target::Target(Project *project, Kit *k) :
ProjectConfiguration(project, k->id()),
d(new TargetPrivate)
{
connect(DeviceManager::instance(), SIGNAL(updated()), this, SLOT(updateDeviceState()));
d->m_kit = p;
d->m_kit = k;
setDisplayName(d->m_kit->displayName());
setIcon(d->m_kit->icon());
KitManager *pm = KitManager::instance();
connect(pm, SIGNAL(kitUpdated(ProjectExplorer::Kit*)),
KitManager *km = KitManager::instance();
connect(km, SIGNAL(kitUpdated(ProjectExplorer::Kit*)),
this, SLOT(handleKitUpdates(ProjectExplorer::Kit*)));
connect(pm, SIGNAL(kitRemoved(ProjectExplorer::Kit*)),
connect(km, SIGNAL(kitRemoved(ProjectExplorer::Kit*)),
this, SLOT(handleKitRemoval(ProjectExplorer::Kit*)));
}
@@ -180,20 +180,20 @@ void Target::onBuildDirectoryChanged()
emit buildDirectoryChanged();
}
void Target::handleKitUpdates(Kit *p)
void Target::handleKitUpdates(Kit *k)
{
if (p != d->m_kit)
if (k != d->m_kit)
return;
setDisplayName(p->displayName());
setIcon(p->icon());
setDisplayName(k->displayName());
setIcon(k->icon());
updateDefaultDeployConfigurations();
emit kitChanged();
}
void Target::handleKitRemoval(Kit *p)
void Target::handleKitRemoval(Kit *k)
{
if (p != d->m_kit)
if (k != d->m_kit)
return;
d->m_kit = 0;
project()->removeTarget(this);