Maemo: Move more functionality into the new target classes.

This commit is contained in:
Christian Kandeler
2011-01-19 11:06:43 +01:00
parent 2ec85cc67a
commit 3a87fdd5f1
10 changed files with 34 additions and 27 deletions

View File

@@ -482,15 +482,12 @@ void MaemoDeployStep::handleUnmounted()
m_mounter->resetMountSpecifications();
setState(Inactive);
break;
case UnmountingOldDirs: {
const Qt4BuildConfiguration * const bc
= static_cast<Qt4BuildConfiguration *>(buildConfiguration());
if (MaemoGlobal::allowsRemoteMounts(bc->qtVersion()))
case UnmountingOldDirs:
if (maemotarget()->allowsRemoteMounts())
setupMount();
else
prepareSftpConnection();
break;
}
case UnmountingCurrentDirs:
setState(GatheringPorts);
m_portsGatherer->start(m_connection, m_cachedDeviceConfig->freePorts());
@@ -827,6 +824,13 @@ const AbstractMaemoToolChain *MaemoDeployStep::toolChain() const
return static_cast<AbstractMaemoToolChain *>(bc->toolChain());
}
const AbstractQt4MaemoTarget *MaemoDeployStep::maemotarget() const
{
const Qt4BuildConfiguration * const bc
= static_cast<Qt4BuildConfiguration *>(buildConfiguration());
return static_cast<AbstractQt4MaemoTarget *>(bc->target());
}
void MaemoDeployStep::handleSysrootInstallerOutput()
{
ASSERT_STATE(QList<State>() << InstallingToSysroot << StopRequested);