From e7a8cad1ea51643bfc21e554e3839b04313c3c5e Mon Sep 17 00:00:00 2001
From: ck <qt-info@nokia.com>
Date: Fri, 6 Aug 2010 15:03:38 +0200
Subject: [PATCH] Maemo: Expand wildcards for deployment information.
Reviewed-by: kh1
---
.../qt-maemo/maemodeployablelistmodel.cpp | 6 ++----
.../qt4projectmanager/qt-maemo/maemoprofilewrapper.cpp | 9 ++++-----
2 files changed, 6 insertions(+), 9 deletions(-)
diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemodeployablelistmodel.cpp b/src/plugins/qt4projectmanager/qt-maemo/maemodeployablelistmodel.cpp
index cf36f033329..64326d2e8ea 100644
--- a/src/plugins/qt4projectmanager/qt-maemo/maemodeployablelistmodel.cpp
+++ b/src/plugins/qt4projectmanager/qt-maemo/maemodeployablelistmodel.cpp
@@ -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; // ???
diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemoprofilewrapper.cpp b/src/plugins/qt4projectmanager/qt-maemo/maemoprofilewrapper.cpp
index ed9afa23b64..b35a90e78c5 100644
--- a/src/plugins/qt4projectmanager/qt-maemo/maemoprofilewrapper.cpp
+++ b/src/plugins/qt4projectmanager/qt-maemo/maemoprofilewrapper.cpp
@@ -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);
}
}
--
GitLab