diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemodeployablelistmodel.cpp b/src/plugins/qt4projectmanager/qt-maemo/maemodeployablelistmodel.cpp index cf36f0333294cd5d023a0e5023bd289f1ee3ac36..64326d2e8eab423d1e02b87dc336825713ac3b09 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 ed9afa23b64491b17b9b16d3ce47d08a34bdda2b..b35a90e78c557163c7f8ba0df28bc866c99e6e13 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); } }