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

Maemo: Have only one MaemoDeployables object per Maemo target.

Browse Source 
It does not depend on any of the settings in the deploy configuration.

Task-number: QTCREATORBUG-2678
This commit is contained in:
Christian Kandeler
2010-10-27 10:50:52 +02:00
parent 2c907fb5b1
commit fe72f7c2f9
6 changed files with 27 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/qt4projectmanager/qt-maemo/maemotemplatesmanager.cpp
View File

@@ -115,7 +115,7 @@ bool MaemoTemplatesManager::handleTarget(ProjectExplorer::Target *target)
const Qt4Target * const qt4Target = qobject_cast<Qt4Target *>(target);
const MaemoDeployStep * const deployStep
= MaemoGlobal::buildStep<MaemoDeployStep>(qt4Target->activeDeployConfiguration());
connect(deployStep->deployables(), SIGNAL(modelReset()), this,
connect(deployStep->deployables().data(), SIGNAL(modelReset()), this,
SLOT(handleProFileUpdated()), Qt::QueuedConnection);
Project * const project = target->project();
@@ -335,7 +335,7 @@ bool MaemoTemplatesManager::updateDesktopFile(const Qt4Target *target,
= existsAlready ? desktopFile.readAll() : desktopTemplate;
QString executable;
const MaemoDeployables * const deployables
const QSharedPointer<MaemoDeployables> &deployables
= MaemoGlobal::buildStep<MaemoDeployStep>(target->activeDeployConfiguration())
->deployables();
for (int i = 0; i < deployables->modelCount(); ++i) {