diff options
| author | Tobias Hunger <[email protected]> | 2012-04-24 15:49:09 +0200 |
|---|---|---|
| committer | Tobias Hunger <[email protected]> | 2012-06-21 12:08:12 +0200 |
| commit | 24314562165588b56a318b3b8a846bf5deda7c41 (patch) | |
| tree | b5dcf951e76d003c2623011b0e91994e06e7e061 /src/plugins/madde/maemosshrunner.cpp | |
| parent | 8c77b8c9d7b25d0c89003c8c4a54e8da5bfb7edd (diff) | |
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 <[email protected]>
Diffstat (limited to 'src/plugins/madde/maemosshrunner.cpp')
| -rw-r--r-- | src/plugins/madde/maemosshrunner.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/plugins/madde/maemosshrunner.cpp b/src/plugins/madde/maemosshrunner.cpp index 5d29a169fb1..15a35269b90 100644 --- a/src/plugins/madde/maemosshrunner.cpp +++ b/src/plugins/madde/maemosshrunner.cpp @@ -35,7 +35,9 @@ #include "maemoremotemountsmodel.h" #include "maemorunconfiguration.h" +#include <projectexplorer/target.h> #include <qt4projectmanager/qt4buildconfiguration.h> +#include <qtsupport/qtprofileinformation.h> #include <remotelinux/linuxdeviceconfiguration.h> #include <utils/qtcassert.h> #include <ssh/sshconnection.h> @@ -54,7 +56,7 @@ MaemoSshRunner::MaemoSshRunner(QObject *parent, MaemoRunConfiguration *runConfig m_mountState(InactiveMountState) { const Qt4BuildConfiguration * const bc = runConfig->activeQt4BuildConfiguration(); - m_qtId = bc && bc->qtVersion() ? bc->qtVersion()->uniqueId() : -1; + m_qtId = bc ? QtSupport::QtProfileInformation::qtVersionId(bc->target()->profile()) : -1; m_mounter->setBuildConfiguration(bc); connect(m_mounter, SIGNAL(mounted()), this, SLOT(handleMounted())); connect(m_mounter, SIGNAL(unmounted()), this, SLOT(handleUnmounted())); |