summaryrefslogtreecommitdiff
path: root/src/plugins/madde/maemodeploybymountsteps.cpp
diff options
context:
space:
mode:
authorChristian Kandeler <christian.kandeler@nokia.com>2012-08-28 15:48:16 +0200
committerChristian Kandeler <christian.kandeler@nokia.com>2012-08-29 09:30:07 +0200
commit2ebce73d13dcdd5300384daf348a2ffd51f52b24 (patch)
treeb7947a8c8eef4c2932a7a46eb6c8edcd06c6eadc /src/plugins/madde/maemodeploybymountsteps.cpp
parent909f936a3256d597f4cd0126e17c7f1182a1a334 (diff)
downloadqt-creator-2ebce73d13dcdd5300384daf348a2ffd51f52b24.tar.gz
Madde: Add deploy step for starting Qemu.
Until now, the code is duplicated in all deploy steps that need access to the device, which obviously doesn't scale. We now do it once in a dedicated step. Change-Id: I27f67f28a2e9ccaf9d2b3a5a9635d84b14f5eb07 Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
Diffstat (limited to 'src/plugins/madde/maemodeploybymountsteps.cpp')
-rw-r--r--src/plugins/madde/maemodeploybymountsteps.cpp25
1 files changed, 1 insertions, 24 deletions
diff --git a/src/plugins/madde/maemodeploybymountsteps.cpp b/src/plugins/madde/maemodeploybymountsteps.cpp
index 0503b9d72e..88806ca38c 100644
--- a/src/plugins/madde/maemodeploybymountsteps.cpp
+++ b/src/plugins/madde/maemodeploybymountsteps.cpp
@@ -40,8 +40,6 @@
#include <projectexplorer/project.h>
#include <projectexplorer/target.h>
#include <qt4projectmanager/qt4buildconfiguration.h>
-#include <qtsupport/baseqtversion.h>
-#include <qtsupport/qtprofileinformation.h>
#include <remotelinux/abstractremotelinuxdeployservice.h>
#include <remotelinux/deployablefile.h>
#include <remotelinux/deploymentinfo.h>
@@ -156,28 +154,7 @@ void AbstractMaemoDeployByMountService::doDeviceSetup()
{
QTC_ASSERT(m_state == Inactive, return);
- if (deviceConfiguration()->machineType() == IDevice::Hardware) {
- handleDeviceSetupDone(true);
- return;
- }
-
- if (MaemoQemuManager::instance().qemuIsRunning()) {
- handleDeviceSetupDone(true);
- return;
- }
-
- MaemoQemuRuntime rt;
- const int qtId = QtSupport::QtProfileInformation::qtVersionId(profile());
- if (MaemoQemuManager::instance().runtimeForQtVersion(qtId, &rt)) {
- MaemoQemuManager::instance().startRuntime();
- emit errorMessage(tr("Cannot deploy: Qemu was not running. "
- "It has now been started up for you, but it will take "
- "a bit of time until it is ready. Please try again then."));
- } else {
- emit errorMessage(tr("Cannot deploy: You want to deploy to Qemu, but it is not enabled "
- "for this Qt version."));
- }
- handleDeviceSetupDone(false);
+ handleDeviceSetupDone(true);
}
void AbstractMaemoDeployByMountService::stopDeviceSetup()