forked from qt-creator/qt-creator
Maemo: Handle missing specification for remote executable.
Reviewed-by: kh1
This commit is contained in:
@@ -139,7 +139,7 @@ QString MaemoDeployables::remoteExecutableFilePath(const QString &localExecutabl
|
|||||||
if (model->localExecutableFilePath() == localExecutableFilePath)
|
if (model->localExecutableFilePath() == localExecutableFilePath)
|
||||||
return model->remoteExecutableFilePath();
|
return model->remoteExecutableFilePath();
|
||||||
}
|
}
|
||||||
Q_ASSERT(!"Invalid local executable!");
|
qWarning("No remote executable specified!");
|
||||||
return QString();
|
return QString();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -202,7 +202,7 @@ void AbstractMaemoRunControl::deploy()
|
|||||||
m_sshDeployer->start();
|
m_sshDeployer->start();
|
||||||
} else {
|
} else {
|
||||||
m_progress.reportFinished();
|
m_progress.reportFinished();
|
||||||
startExecution();
|
startExecutionIfPossible();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -248,6 +248,16 @@ bool AbstractMaemoRunControl::isCleaning() const
|
|||||||
return m_initialCleaner && m_initialCleaner->isRunning();
|
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()
|
void AbstractMaemoRunControl::startExecution()
|
||||||
{
|
{
|
||||||
m_sshRunner.reset(new MaemoSshRunner(m_devConfig.server, remoteCall()));
|
m_sshRunner.reset(new MaemoSshRunner(m_devConfig.server, remoteCall()));
|
||||||
@@ -315,7 +325,7 @@ void AbstractMaemoRunControl::handleDeployThreadFinished()
|
|||||||
emit finished();
|
emit finished();
|
||||||
} else {
|
} else {
|
||||||
m_progress.reportFinished();
|
m_progress.reportFinished();
|
||||||
startExecution();
|
startExecutionIfPossible();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -109,6 +109,7 @@ private:
|
|||||||
|
|
||||||
void startInitialCleanup();
|
void startInitialCleanup();
|
||||||
void killRemoteProcesses(const QStringList &apps, bool initialCleanup);
|
void killRemoteProcesses(const QStringList &apps, bool initialCleanup);
|
||||||
|
void startExecutionIfPossible();
|
||||||
bool isCleaning() const;
|
bool isCleaning() const;
|
||||||
bool isDeploying() const;
|
bool isDeploying() const;
|
||||||
QString remoteSudo() const;
|
QString remoteSudo() const;
|
||||||
|
|||||||
Reference in New Issue
Block a user