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

Maemo: Use project file's INSTALLS variable for packaging.

Browse Source
This commit is contained in:
ck
2010-06-16 08:57:13 +02:00
parent 72bd632ca4
commit f96efa07e1
4 changed files with 359 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/plugins/qt4projectmanager/qt-maemo/maemopackagecreationwidget.cpp
View File

@@ -109,9 +109,9 @@ void MaemoPackageCreationWidget::addFile()
deployable(QDir::toNativeSeparators(QFileInfo(localFile).absoluteFilePath()),
"/");
MaemoPackageContents * const contents = m_step->packageContents();
if (!contents->addDeployable(deployable)) {
QMessageBox::information(this, tr("File already in package"),
tr("You have already added this file."));
QString errorString;
if (!contents->addDeployable(deployable, &errorString)) {
QMessageBox::information(this, tr("Error adding file"), errorString);
} else {
const QModelIndex newIndex
= contents->index(contents->rowCount() - 1, 1);
@@ -128,8 +128,13 @@ void MaemoPackageCreationWidget::removeFile()
if (selectedRows.isEmpty())
return;
const int row = selectedRows.first().row();
if (row != 0)
m_step->packageContents()->removeDeployableAt(row);
if (row != 0) {
QString errorString;
if (!m_step->packageContents()->removeDeployableAt(row, &errorString)) {
QMessageBox::information(this, tr("Error removing file"),
errorString);
}
}
}
void MaemoPackageCreationWidget::enableOrDisableRemoveButton()