From 4848be6fe806f2f0602db4c0414316c387bb2aff Mon Sep 17 00:00:00 2001 From: Christian Kandeler Date: Mon, 29 Aug 2011 17:10:45 +0200 Subject: [PATCH] Harmattan: Include Aegis manifest in list of files to add to project. Change-Id: I04f8787e6a334ad801af2e3b8006c000a1fa0546 Reviewed-on: http://codereview.qt.nokia.com/3823 Reviewed-by: Qt Sanity Bot Reviewed-by: Kai Koehne --- src/plugins/remotelinux/qt4maemotarget.cpp | 39 ++++++++++------------ 1 file changed, 18 insertions(+), 21 deletions(-) diff --git a/src/plugins/remotelinux/qt4maemotarget.cpp b/src/plugins/remotelinux/qt4maemotarget.cpp index 1fa1070c1dc..02fd14ed512 100644 --- a/src/plugins/remotelinux/qt4maemotarget.cpp +++ b/src/plugins/remotelinux/qt4maemotarget.cpp @@ -275,6 +275,23 @@ void AbstractQt4MaemoTarget::handleTargetAdded(ProjectExplorer::Target *target) if (status == ActionSuccessful) // Don't do this when the packaging data already exists. initPackagingSettingsFromOtherTarget(); handleTargetAddedSpecial(); + if (status == ActionSuccessful) { + const QStringList &files = packagingFilePaths(); + if (!files.isEmpty()) { + const QString list = QLatin1String("
  • ") + files.join(QLatin1String("
  • ")) + + QLatin1String("
"); + QMessageBox::StandardButton button = QMessageBox::question(Core::ICore::instance()->mainWindow(), + tr("Add Packaging Files to Project"), + tr("Qt Creator has set up the following files to enable " + "packaging:\n %1\nDo you want to add them to the project?") + .arg(list), QMessageBox::Yes | QMessageBox::No); + if (button == QMessageBox::Yes) { + ProjectExplorer::ProjectExplorerPlugin::instance() + ->addExistingFiles(project()->rootProjectNode(), files); + } + } + } + m_isInitialized = true; } @@ -326,27 +343,7 @@ AbstractQt4MaemoTarget::ActionStatus AbstractQt4MaemoTarget::createTemplates() return ActionFailed; } - const ActionStatus actionStatus = createSpecialTemplates(); - if (actionStatus == ActionFailed) - return ActionFailed; - if (actionStatus == ActionSuccessful) { - const QStringList &files = packagingFilePaths(); - if (!files.isEmpty()) { - const QString list = QLatin1String("
  • ") - + files.join(QLatin1String("
  • ")) + QLatin1String("
"); - QMessageBox::StandardButton button - = QMessageBox::question(Core::ICore::instance()->mainWindow(), - tr("Add Packaging Files to Project"), - tr("Qt Creator has set up the following files to enable " - "packaging:\n %1\nDo you want to add them to the project?") - .arg(list), QMessageBox::Yes | QMessageBox::No); - if (button == QMessageBox::Yes) { - ProjectExplorer::ProjectExplorerPlugin::instance() - ->addExistingFiles(project()->rootProjectNode(), files); - } - } - } - return actionStatus; + return createSpecialTemplates(); } bool AbstractQt4MaemoTarget::initPackagingSettingsFromOtherTarget()