Maemo: Use qmake configuration from sysroot.

Also allow absolute file paths for deployables.

Reviewed-by: kh1
This commit is contained in:
ck
2010-07-07 16:49:39 +02:00
parent b87f3fbcc8
commit 68beb601f3
6 changed files with 22 additions and 12 deletions

View File

@@ -43,6 +43,7 @@
#include "maemodeployablelistmodel.h"
#include "maemopackagecreationstep.h"
#include "maemotoolchain.h"
#include <qt4projectmanager/qt4buildconfiguration.h>
#include <qt4projectmanager/qt4nodes.h>
@@ -74,9 +75,12 @@ void MaemoDeployables::createModels(const Qt4ProFileNode *proFileNode)
switch (type) {
case ApplicationTemplate:
case LibraryTemplate:
case ScriptTemplate:
m_listModels << new MaemoDeployableListModel(proFileNode, this);
case ScriptTemplate: {
const QString qConfigFile = m_packagingStep->maemoToolChain()->sysrootRoot()
+ QLatin1String("/usr/share/qt/mkspecs/qconfig.pri");
m_listModels << new MaemoDeployableListModel(proFileNode, qConfigFile, this);
break;
}
case SubDirsTemplate: {
const QList<ProjectExplorer::ProjectNode *> &subProjects
= proFileNode->subProjectNodes();