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

Maemo: Use qmake configuration from sysroot.

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -40,8 +40,11 @@ namespace Qt4ProjectManager {
namespace Internal {
MaemoDeployableListModel::MaemoDeployableListModel(const Qt4ProFileNode *proFileNode,
QObject *parent)
: QAbstractTableModel(parent), m_proFileNode(proFileNode), m_modified(false)
const QString &qConfigFile, QObject *parent)
: QAbstractTableModel(parent),
m_proFileNode(proFileNode),
m_modified(false),
m_proFileWrapper(new ProFileWrapper(m_proFileNode->path(), qConfigFile))
{
buildModel();
}
@@ -52,7 +55,6 @@ bool MaemoDeployableListModel::buildModel()
{
m_deployables.clear();
m_proFileWrapper.reset(new ProFileWrapper(m_proFileNode->path()));
const ProFileWrapper::InstallsList &installs = m_proFileWrapper->installs();
if (installs.targetPath.isEmpty()) {
const QString remoteDir = m_proFileNode->projectType() == LibraryTemplate