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

Harmattan: Include Aegis manifest in list of files to add to project.

Browse Source 
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>
This commit is contained in:
Christian Kandeler
2011-08-29 17:10:45 +02:00
committed by Eike Ziller
parent e50344fdda
commit 4848be6fe8
1 changed files with 18 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
src/plugins/remotelinux/qt4maemotarget.cpp
View File

@@ -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()