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

Maemo: Don't unify packaging metadata between targets as rigorously.

Browse Source 
This allows people to do external changes to their files without
Creator overwriting them.

Change-Id: I71fc7cf6dabb9a61762992b8c01f971f563e17ab
Reviewed-on: http://codereview.qt.nokia.com/12
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
This commit is contained in:
Christian Kandeler
2011-05-19 12:42:37 +02:00
committed by Tobias Hunger
parent ed0f9f678e
commit 782953513e
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/plugins/qt4projectmanager/qt-maemo/qt4maemotarget.cpp
View File

@@ -268,9 +268,11 @@ void AbstractQt4MaemoTarget::handleTargetAdded(ProjectExplorer::Target *target)
this, SLOT(handleTargetAdded(ProjectExplorer::Target*))); this, SLOT(handleTargetAdded(ProjectExplorer::Target*)));
connect(project(), SIGNAL(aboutToRemoveTarget(ProjectExplorer::Target*)), connect(project(), SIGNAL(aboutToRemoveTarget(ProjectExplorer::Target*)),
SLOT(handleTargetToBeRemoved(ProjectExplorer::Target*))); SLOT(handleTargetToBeRemoved(ProjectExplorer::Target*)));
if (createTemplates() == ActionFailed) const ActionStatus status = createTemplates();
if (status == ActionFailed)
return; return;
initPackagingSettingsFromOtherTarget(); if (status == ActionSuccessful) // Don't do this when the packaging data already exists.
initPackagingSettingsFromOtherTarget();
handleTargetAddedSpecial(); handleTargetAddedSpecial();
m_isInitialized = true; m_isInitialized = true;
} }