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

Maemo: Change default deploy directory prefix.

Browse Source 
Also set build directory for profile reader.
This commit is contained in:
Christian Kandeler
2010-08-19 14:39:31 +02:00
parent c072293ef0
commit 4220fade22
3 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -45,7 +45,8 @@ MaemoDeployableListModel::MaemoDeployableListModel(const Qt4ProFileNode *proFile
: QAbstractTableModel(parent),
m_proFileNode(proFileNode),
m_modified(false),
m_proFileWrapper(new MaemoProFileWrapper(m_proFileNode->path(), proFileOption))
m_proFileWrapper(new MaemoProFileWrapper(m_proFileNode->path(),
m_proFileNode->buildDir(), proFileOption))
{
buildModel();
}
@@ -59,8 +60,8 @@ bool MaemoDeployableListModel::buildModel()
const MaemoProFileWrapper::InstallsList &installs = m_proFileWrapper->installs();
if (installs.targetPath.isEmpty()) {
const QString remoteDir = m_proFileNode->projectType() == LibraryTemplate
? QLatin1String("/usr/local/lib")
: QLatin1String("/usr/local/bin");
? QLatin1String("/usr/lib")
: QLatin1String("/usr/bin");
m_deployables.prepend(MaemoDeployable(localExecutableFilePath(),
remoteDir));
QFile projectFile(m_proFileNode->path());