From 782953513ef231566cfde65d0d94f45eb3dae495 Mon Sep 17 00:00:00 2001
From: Christian Kandeler <christian.kandeler@nokia.com>
Date: Thu, 19 May 2011 12:42:37 +0200
Subject: [PATCH] Maemo: Don't unify packaging metadata between targets as
rigorously.
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>
---
src/plugins/qt4projectmanager/qt-maemo/qt4maemotarget.cpp | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/plugins/qt4projectmanager/qt-maemo/qt4maemotarget.cpp b/src/plugins/qt4projectmanager/qt-maemo/qt4maemotarget.cpp
index 5e51e7c82c6..a711a51e26b 100644
--- a/src/plugins/qt4projectmanager/qt-maemo/qt4maemotarget.cpp
+++ b/src/plugins/qt4projectmanager/qt-maemo/qt4maemotarget.cpp
@@ -268,9 +268,11 @@ void AbstractQt4MaemoTarget::handleTargetAdded(ProjectExplorer::Target *target)
this, SLOT(handleTargetAdded(ProjectExplorer::Target*)));
connect(project(), SIGNAL(aboutToRemoveTarget(ProjectExplorer::Target*)),
SLOT(handleTargetToBeRemoved(ProjectExplorer::Target*)));
- if (createTemplates() == ActionFailed)
+ const ActionStatus status = createTemplates();
+ if (status == ActionFailed)
return;
- initPackagingSettingsFromOtherTarget();
+ if (status == ActionSuccessful) // Don't do this when the packaging data already exists.
+ initPackagingSettingsFromOtherTarget();
handleTargetAddedSpecial();
m_isInitialized = true;
}
--
GitLab