diff options
| author | hjk <qthjk@ovi.com> | 2012-07-25 17:41:01 +0200 |
|---|---|---|
| committer | Christian Kandeler <christian.kandeler@nokia.com> | 2012-07-26 12:50:06 +0200 |
| commit | b906360a341800b84b5c8e0e2442698de10beb9e (patch) | |
| tree | 4baf03f4aeb817c2c622c033fc7dd33674ab1038 /src/plugins/madde/maddeuploadandinstallpackagesteps.cpp | |
| parent | 0fcd30cc6191925ea3cba2baad6533a946c9ccd2 (diff) | |
| download | qt-creator-b906360a341800b84b5c8e0e2442698de10beb9e.tar.gz | |
madde/qnx/remotelinux: adjust after profile changes
More Profile use, less dependency on QtSupport,
Derive qtVersionId from profile instead of qt build configuration.
Replace qt4BuildConfiguration with buildConfiguration.
Use IDevice base class in AbstractRemoteLinuxApplicationRunner
and in other places. Simplify remote linux runconfiguration
Change-Id: I6414d3d8146d16c360b3a0465c57a052ea71f899
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
Diffstat (limited to 'src/plugins/madde/maddeuploadandinstallpackagesteps.cpp')
| -rw-r--r-- | src/plugins/madde/maddeuploadandinstallpackagesteps.cpp | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/src/plugins/madde/maddeuploadandinstallpackagesteps.cpp b/src/plugins/madde/maddeuploadandinstallpackagesteps.cpp index 394a1f0ddd..0c475058f4 100644 --- a/src/plugins/madde/maddeuploadandinstallpackagesteps.cpp +++ b/src/plugins/madde/maddeuploadandinstallpackagesteps.cpp @@ -33,16 +33,15 @@ #include "maemopackagecreationstep.h" #include "maemopackageinstaller.h" #include "maemoqemumanager.h" -#include "qt4maemodeployconfiguration.h" #include <projectexplorer/target.h> -#include <qt4projectmanager/qt4buildconfiguration.h> #include <qtsupport/baseqtversion.h> #include <qtsupport/qtprofileinformation.h> #include <remotelinux/abstractuploadandinstallpackageservice.h> -#include <remotelinux/linuxdeviceconfiguration.h> +#include <remotelinux/remotelinuxdeployconfiguration.h> #include <ssh/sshconnection.h> +using namespace ProjectExplorer; using namespace RemoteLinux; namespace Madde { @@ -60,7 +59,7 @@ protected: void doDeviceSetup() { - if (deviceConfiguration()->machineType() == LinuxDeviceConfiguration::Hardware) { + if (deviceConfiguration()->machineType() == IDevice::Hardware) { handleDeviceSetupDone(true); return; } @@ -71,8 +70,7 @@ protected: } MaemoQemuRuntime rt; - const int qtId = qt4BuildConfiguration() - ? QtSupport::QtProfileInformation::qtVersionId(qt4BuildConfiguration()->target()->profile()) : -1; + 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. " |