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

Maemo: Correctly deploy subdirs projects.

Browse Source 
Task-number: QTCREATORBUG-1614, QTCREATORBUG-1810
Reviewed-by: kh1
This commit is contained in:
ck
2010-07-07 14:50:37 +02:00
parent 773d580604
commit 608fcf3123
13 changed files with 127 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -238,10 +238,9 @@ QString AbstractMaemoRunControl::packageFilePath() const
QString AbstractMaemoRunControl::executableFilePathOnTarget() const
{
// TODO: The local executable is known directly by us (from RunConfiguration::target(),
// so we must not rely on the packaging step for this information (which will
// no longer provide it, anyway)/
return m_runConfig->packageStep()->deployables()->remoteExecutableFilePath(m_runConfig->packageStep()->localExecutableFilePath());
const MaemoDeployables * const deployables
= m_runConfig->packageStep()->deployables();
return deployables->remoteExecutableFilePath(m_runConfig->executable());
}
bool AbstractMaemoRunControl::isCleaning() const