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

Maemo: Prepare unpackaged deployment.

Browse Source 
Reviewed-by: kh1
This commit is contained in:
ck
2010-06-21 11:25:06 +02:00
parent 13bb14dd3c
commit a793217c07
5 changed files with 60 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -124,21 +124,22 @@ void AbstractMaemoRunControl::startDeployment(bool forDebugging)
emit finished();
} else {
m_deployables.clear();
if (m_runConfig->currentlyNeedsDeployment(m_devConfig.server.host)) {
if (m_runConfig->currentlyNeedsDeployment(m_devConfig.server.host,
packageFilePath())) {
m_deployables.append(Deployable(packageFileName(),
QFileInfo(executableOnHost()).canonicalPath(),
&MaemoRunConfiguration::wasDeployed));
QFileInfo(executableOnHost()).canonicalPath()));
m_needsInstall = true;
} else {
m_needsInstall = false;
}
if (forDebugging
&& m_runConfig->debuggingHelpersNeedDeployment(m_devConfig.server.host)) {
const QFileInfo &info(m_runConfig->dumperLib());
m_deployables.append(Deployable(info.fileName(), info.canonicalPath(),
&MaemoRunConfiguration::debuggingHelpersDeployed));
if (forDebugging) {
const QFileInfo info(m_runConfig->dumperLib());
if (info.exists()
&& m_runConfig->currentlyNeedsDeployment(m_devConfig.server.host,
info.filePath())) {
m_deployables.append(Deployable(info.fileName(), info.canonicalPath()));
}
}
deploy();
}
}
@@ -179,7 +180,8 @@ void AbstractMaemoRunControl::deploy()
void AbstractMaemoRunControl::handleFileCopied()
{
Deployable deployable = m_deployables.takeFirst();
(m_runConfig->*deployable.updateTimestamp)(m_devConfig.server.host);
m_runConfig->setDeployed(m_devConfig.server.host,
deployable.dir + QLatin1Char('/') + deployable.fileName);
m_progress.setProgressValue(m_progress.progressValue() + 1);
}