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

Maemo: Expand wildcards for deployment information.

Browse Source 
Reviewed-by: kh1
This commit is contained in:
ck
2010-08-06 15:03:38 +02:00
parent 06ce535217
commit e7a8cad1ea
2 changed files with 6 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/plugins/qt4projectmanager/qt-maemo/maemodeployablelistmodel.cpp
View File

@@ -80,10 +80,8 @@ bool MaemoDeployableListModel::buildModel()
installs.targetPath)); installs.targetPath));
} }
foreach (const MaemoProFileWrapper::InstallsElem &elem, installs.normalElems) { foreach (const MaemoProFileWrapper::InstallsElem &elem, installs.normalElems) {
foreach (const QString &file, elem.files) { foreach (const QString &file, elem.files)
m_deployables << MaemoDeployable(m_proFileWrapper->absFilePath(file), m_deployables << MaemoDeployable(file, elem.path);
elem.path);
}
} }
m_modified = true; // ??? m_modified = true; // ???

9
src/plugins/qt4projectmanager/qt-maemo/maemoprofilewrapper.cpp
View File

@@ -54,7 +54,9 @@ MaemoProFileWrapper::InstallsList MaemoProFileWrapper::installs() const
continue; continue;
} }
const QStringList &files = varValues(filesVar(elem)); const QStringList &files
= m_proFileReader->absoluteFileValues(filesVar(elem),
m_proDir.path(), QStringList() << m_proDir.path(), m_proFile);
if (elem == TargetVar) { if (elem == TargetVar) {
if (!list.targetPath.isEmpty()) { if (!list.targetPath.isEmpty()) {
@@ -63,11 +65,8 @@ MaemoProFileWrapper::InstallsList MaemoProFileWrapper::installs() const
} }
list.targetPath = paths.first(); list.targetPath = paths.first();
} else { } else {
if (files.isEmpty()) { if (files.isEmpty())
qWarning("Error: Variable %s has no RHS.",
qPrintable(filesVar(elem)));
continue; continue;
}
list.normalElems << InstallsElem(elem, paths.first(), files); list.normalElems << InstallsElem(elem, paths.first(), files);
} }
} }