forked from qt-creator/qt-creator
Maemo: Handle missing specification for remote executable.
Reviewed-by: kh1
This commit is contained in:
@@ -202,7 +202,7 @@ void AbstractMaemoRunControl::deploy()
|
||||
m_sshDeployer->start();
|
||||
} else {
|
||||
m_progress.reportFinished();
|
||||
startExecution();
|
||||
startExecutionIfPossible();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -248,6 +248,16 @@ bool AbstractMaemoRunControl::isCleaning() const
|
||||
return m_initialCleaner && m_initialCleaner->isRunning();
|
||||
}
|
||||
|
||||
void AbstractMaemoRunControl::startExecutionIfPossible()
|
||||
{
|
||||
if (executableFilePathOnTarget().isEmpty()) {
|
||||
handleError(tr("Cannot run: No remote executable set."));
|
||||
emit finished();
|
||||
} else {
|
||||
startExecution();
|
||||
}
|
||||
}
|
||||
|
||||
void AbstractMaemoRunControl::startExecution()
|
||||
{
|
||||
m_sshRunner.reset(new MaemoSshRunner(m_devConfig.server, remoteCall()));
|
||||
@@ -315,7 +325,7 @@ void AbstractMaemoRunControl::handleDeployThreadFinished()
|
||||
emit finished();
|
||||
} else {
|
||||
m_progress.reportFinished();
|
||||
startExecution();
|
||||
startExecutionIfPossible();
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user