diff options
| author | Christian Kandeler <christian.kandeler@nokia.com> | 2011-08-29 17:10:45 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@nokia.com> | 2011-09-01 13:15:12 +0200 |
| commit | 4848be6fe806f2f0602db4c0414316c387bb2aff (patch) | |
| tree | f2aa8d4d47a648dedb4855fba5ec20eb37d6fac1 | |
| parent | e50344fdda5e48a92105433e3a537da39f47c51f (diff) | |
| download | qt-creator-4848be6fe806f2f0602db4c0414316c387bb2aff.tar.gz | |
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 <qt_sanity_bot@ovi.com>
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
| -rw-r--r-- | src/plugins/remotelinux/qt4maemotarget.cpp | 39 |
1 files changed, 18 insertions, 21 deletions
diff --git a/src/plugins/remotelinux/qt4maemotarget.cpp b/src/plugins/remotelinux/qt4maemotarget.cpp index 1fa1070c1d..02fd14ed51 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("<ul><li>") + files.join(QLatin1String("</li><li>")) + + QLatin1String("</li></ul>"); + QMessageBox::StandardButton button = QMessageBox::question(Core::ICore::instance()->mainWindow(), + tr("Add Packaging Files to Project"), + tr("<html>Qt Creator has set up the following files to enable " + "packaging:\n %1\nDo you want to add them to the project?</html>") + .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("<ul><li>") - + files.join(QLatin1String("</li><li>")) + QLatin1String("</li></ul>"); - QMessageBox::StandardButton button - = QMessageBox::question(Core::ICore::instance()->mainWindow(), - tr("Add Packaging Files to Project"), - tr("<html>Qt Creator has set up the following files to enable " - "packaging:\n %1\nDo you want to add them to the project?</html>") - .arg(list), QMessageBox::Yes | QMessageBox::No); - if (button == QMessageBox::Yes) { - ProjectExplorer::ProjectExplorerPlugin::instance() - ->addExistingFiles(project()->rootProjectNode(), files); - } - } - } - return actionStatus; + return createSpecialTemplates(); } bool AbstractQt4MaemoTarget::initPackagingSettingsFromOtherTarget() |