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

Maemo: Add option to disable packaging.

Browse Source 
Task-number: QTCREATORBUG-1636
Reviewed-by: kh1
This commit is contained in:
ck
2010-06-22 14:40:08 +02:00
parent a269232df9
commit dd666a3af4
10 changed files with 126 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/plugins/qt4projectmanager/qt-maemo/maemopackagecontents.cpp
View File

@@ -58,16 +58,16 @@ MaemoPackageContents::MaemoPackageContents(MaemoPackageCreationStep *packageStep
{
}
MaemoPackageContents::Deployable MaemoPackageContents::deployableAt(int row) const
MaemoDeployable MaemoPackageContents::deployableAt(int row) const
{
Q_ASSERT(row >= 0 && row < rowCount());
return row == 0
? Deployable(m_packageStep->localExecutableFilePath(),
? MaemoDeployable(m_packageStep->localExecutableFilePath(),
remoteExecutableFilePath())
: m_deployables.at(row - 1);
}
bool MaemoPackageContents::addDeployable(const Deployable &deployable)
bool MaemoPackageContents::addDeployable(const MaemoDeployable &deployable)
{
if (m_deployables.contains(deployable) || deployableAt(0) == deployable)
return false;
@@ -103,7 +103,7 @@ QVariant MaemoPackageContents::data(const QModelIndex &index, int role) const
if (!index.isValid() || index.row() >= rowCount())
return QVariant();
const Deployable &d = deployableAt(index.row());
const MaemoDeployable &d = deployableAt(index.row());
if (index.column() == 0 && role == Qt::DisplayRole)
return d.localFilePath;
if (role == Qt::DisplayRole || role == Qt::EditRole)
@@ -151,7 +151,7 @@ QVariantMap MaemoPackageContents::toMap() const
map.insert(REMOTE_EXE_KEY, m_remoteExecutableFilePath);
QStringList localFiles;
QStringList remoteFiles;
foreach (const Deployable &p, m_deployables) {
foreach (const MaemoDeployable &p, m_deployables) {
localFiles << p.localFilePath;
remoteFiles << p.remoteFilePath;
}
@@ -170,7 +170,7 @@ void MaemoPackageContents::fromMap(const QVariantMap &map)
qWarning("%s: serialized data inconsistent", Q_FUNC_INFO);
const int count = qMin(localFiles.count(), remoteFiles.count());
for (int i = 0; i < count; ++i)
m_deployables << Deployable(localFiles.at(i), remoteFiles.at(i));
m_deployables << MaemoDeployable(localFiles.at(i), remoteFiles.at(i));
}
QString MaemoPackageContents::remoteExecutableFilePath() const