Commit e7a8cad1 authored by ck's avatar ck
Browse files

Maemo: Expand wildcards for deployment information.

Reviewed-by: kh1
parent 06ce5352
......@@ -80,10 +80,8 @@ bool MaemoDeployableListModel::buildModel()
installs.targetPath));
}
foreach (const MaemoProFileWrapper::InstallsElem &elem, installs.normalElems) {
foreach (const QString &file, elem.files) {
m_deployables << MaemoDeployable(m_proFileWrapper->absFilePath(file),
elem.path);
}
foreach (const QString &file, elem.files)
m_deployables << MaemoDeployable(file, elem.path);
}
m_modified = true; // ???
......
......@@ -54,7 +54,9 @@ MaemoProFileWrapper::InstallsList MaemoProFileWrapper::installs() const
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 (!list.targetPath.isEmpty()) {
......@@ -63,11 +65,8 @@ MaemoProFileWrapper::InstallsList MaemoProFileWrapper::installs() const
}
list.targetPath = paths.first();
} else {
if (files.isEmpty()) {
qWarning("Error: Variable %s has no RHS.",
qPrintable(filesVar(elem)));
if (files.isEmpty())
continue;
}
list.normalElems << InstallsElem(elem, paths.first(), files);
}
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment