diff options
| author | Tobias Hunger <tobias.hunger@nokia.com> | 2012-04-24 15:49:09 +0200 |
|---|---|---|
| committer | Tobias Hunger <tobias.hunger@nokia.com> | 2012-06-21 12:08:12 +0200 |
| commit | 24314562165588b56a318b3b8a846bf5deda7c41 (patch) | |
| tree | b5dcf951e76d003c2623011b0e91994e06e7e061 /src/plugins/madde/maddeuploadandinstallpackagesteps.cpp | |
| parent | 8c77b8c9d7b25d0c89003c8c4a54e8da5bfb7edd (diff) | |
| download | qt-creator-24314562165588b56a318b3b8a846bf5deda7c41.tar.gz | |
Profile introduction
Introduce Profiles to store sets of values that describe a system/device.
These profiles are held by a target, getting rid of much of the information
stored in the Build-/Run-/DeployConfigurations, greatly simplifying those.
This is a squash of the wip/profile branch which has been on gerrit for a
while, rebased to current master.
Change-Id: I25956c8dd4d1962b2134bfaa8a8076ae3909460f
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
Diffstat (limited to 'src/plugins/madde/maddeuploadandinstallpackagesteps.cpp')
| -rw-r--r-- | src/plugins/madde/maddeuploadandinstallpackagesteps.cpp | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/plugins/madde/maddeuploadandinstallpackagesteps.cpp b/src/plugins/madde/maddeuploadandinstallpackagesteps.cpp index 348fb58f31..3832fd4efd 100644 --- a/src/plugins/madde/maddeuploadandinstallpackagesteps.cpp +++ b/src/plugins/madde/maddeuploadandinstallpackagesteps.cpp @@ -36,10 +36,11 @@ #include "maemopackageinstaller.h" #include "maemoqemumanager.h" #include "qt4maemodeployconfiguration.h" -#include "qt4maemotarget.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 <ssh/sshconnection.h> @@ -72,8 +73,8 @@ protected: } MaemoQemuRuntime rt; - const int qtId = qt4BuildConfiguration() && qt4BuildConfiguration()->qtVersion() - ? qt4BuildConfiguration()->qtVersion()->uniqueId() : -1; + const int qtId = qt4BuildConfiguration() + ? QtSupport::QtProfileInformation::qtVersionId(qt4BuildConfiguration()->target()->profile()) : -1; if (MaemoQemuManager::instance().runtimeForQtVersion(qtId, &rt)) { MaemoQemuManager::instance().startRuntime(); emit errorMessage(tr("Cannot deploy: Qemu was not running. " @@ -164,7 +165,8 @@ MaemoUploadAndInstallPackageStep::MaemoUploadAndInstallPackageStep(ProjectExplor void MaemoUploadAndInstallPackageStep::ctor() { setDefaultDisplayName(displayName()); - if (qobject_cast<Qt4HarmattanTarget *>(target())) + Core::Id deviceType = ProjectExplorer::DeviceTypeProfileInformation::deviceTypeId(target()->profile()); + if (deviceType == Core::Id(HarmattanOsType)) m_deployService = new HarmattanUploadAndInstallPackageAction(this); else m_deployService = new MaemoUploadAndInstallPackageAction(this); |