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

Maemo: Start up Qemu if required.

Browse Source 
We still fail in that case, because the connection can't succeed
due to Qemu's long start-up time.

Task-number: QTCREATORBUG-3607
This commit is contained in:
Christian Kandeler
2011-02-08 11:55:28 +01:00
parent 1c1ebe40a0
commit a57da84be8
5 changed files with 36 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/plugins/qt4projectmanager/qt-maemo/maemosshrunner.cpp
View File

@@ -36,6 +36,7 @@
#include "maemodeploystep.h"
#include "maemoglobal.h"
#include "maemoqemumanager.h"
#include "maemoremotemounter.h"
#include "maemoremotemountsmodel.h"
#include "maemorunconfiguration.h"
@@ -97,11 +98,20 @@ void MaemoSshRunner::start()
ASSERT_STATE(QList<State>() << Inactive << StopRequested);
if (m_remoteExecutable.isEmpty()) {
emitError(tr("Cannot run: No remote executable set."));
emitError(tr("Cannot run: No remote executable set."), true);
return;
}
if (!m_devConfig) {
emitError(tr("Cannot run: No device configuration set."));
emitError(tr("Cannot run: No device configuration set."), true);
return;
}
if (m_devConfig->type() == MaemoDeviceConfig::Simulator
&& !MaemoQemuManager::instance().qemuIsRunning()) {
MaemoQemuManager::instance().startRuntime();
emitError(tr("Cannot run: Qemu was not running. "
"It has now been started up for you, but it will take "
"a bit of time until it is ready."), true);
return;
}
@@ -317,11 +327,13 @@ void MaemoSshRunner::setState(State newState)
m_state = newState;
}
void MaemoSshRunner::emitError(const QString &errorMsg)
void MaemoSshRunner::emitError(const QString &errorMsg, bool force)
{
if (m_state != Inactive) {
setState(Inactive);
emit error(errorMsg);
} else if (force) {
emit error(errorMsg);
}
}