diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemodebugsupport.cpp b/src/plugins/qt4projectmanager/qt-maemo/maemodebugsupport.cpp index a232aacea1f..6eafc765c1c 100644 --- a/src/plugins/qt4projectmanager/qt-maemo/maemodebugsupport.cpp +++ b/src/plugins/qt4projectmanager/qt-maemo/maemodebugsupport.cpp @@ -68,7 +68,7 @@ RunControl *MaemoDebugSupport::createDebugRunControl(MaemoRunConfiguration *runC } if (debuggingType != MaemoRunConfiguration::DebugQmlOnly) { params.processArgs = runConfig->arguments(); - params.sysRoot = runConfig->sysRoot(); + params.sysRoot = runConfig->activeQt4BuildConfiguration()->qtVersion()->systemRoot(); params.toolChainAbi = runConfig->abi(); if (runConfig->useRemoteGdb()) { params.startMode = StartRemoteGdb; diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemorunconfiguration.cpp b/src/plugins/qt4projectmanager/qt-maemo/maemorunconfiguration.cpp index a65f588c2c2..aaaf29351e8 100644 --- a/src/plugins/qt4projectmanager/qt-maemo/maemorunconfiguration.cpp +++ b/src/plugins/qt4projectmanager/qt-maemo/maemorunconfiguration.cpp @@ -217,15 +217,6 @@ MaemoDeviceConfig::ConstPtr MaemoRunConfiguration::deviceConfig() const return step ? step->helper().deviceConfig() : MaemoDeviceConfig::ConstPtr(); } -const MaemoToolChain *MaemoRunConfiguration::toolchain() const -{ - Qt4BuildConfiguration *qt4bc(activeQt4BuildConfiguration()); - QTC_ASSERT(qt4bc, return 0); - MaemoToolChain *tc = dynamic_cast(qt4bc->toolChain()); - QTC_ASSERT(tc != 0, return 0); - return tc; -} - const QString MaemoRunConfiguration::gdbCmd() const { return QDir::toNativeSeparators(activeBuildConfiguration()->toolChain()->debuggerCommand()); @@ -241,13 +232,6 @@ AbstractLinuxDeviceDeployStep *MaemoRunConfiguration::deployStep() const return MaemoGlobal::earlierBuildStep(deployConfig(), 0); } -const QString MaemoRunConfiguration::sysRoot() const -{ - if (const MaemoToolChain *tc = toolchain()) - return tc->sysroot(); - return QString(); -} - const QString MaemoRunConfiguration::targetRoot() const { QTC_ASSERT(activeQt4BuildConfiguration(), return QString()); diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemorunconfiguration.h b/src/plugins/qt4projectmanager/qt-maemo/maemorunconfiguration.h index 4fa31ac0ca0..b2329470222 100644 --- a/src/plugins/qt4projectmanager/qt-maemo/maemorunconfiguration.h +++ b/src/plugins/qt4projectmanager/qt-maemo/maemorunconfiguration.h @@ -91,10 +91,8 @@ public: Qt4MaemoDeployConfiguration *deployConfig() const; MaemoRemoteMountsModel *remoteMounts() const { return m_remoteMounts; } - const MaemoToolChain *toolchain() const; QString localExecutableFilePath() const; QString remoteExecutableFilePath() const; - const QString sysRoot() const; const QString targetRoot() const; const QString arguments() const; void setArguments(const QString &args); diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemorunfactories.cpp b/src/plugins/qt4projectmanager/qt-maemo/maemorunfactories.cpp index fb1162d6468..07b6b98407e 100644 --- a/src/plugins/qt4projectmanager/qt-maemo/maemorunfactories.cpp +++ b/src/plugins/qt4projectmanager/qt-maemo/maemorunfactories.cpp @@ -163,7 +163,8 @@ bool MaemoRunControlFactory::canRun(RunConfiguration *runConfiguration, const MaemoRunConfiguration * const maemoRunConfig = qobject_cast(runConfiguration); if (!maemoRunConfig - || !maemoRunConfig->deviceConfig() || !maemoRunConfig->toolchain() + || !maemoRunConfig->deviceConfig() + || !maemoRunConfig->activeQt4BuildConfiguration() || maemoRunConfig->remoteExecutableFilePath().isEmpty()) return false; const int freePortCount = maemoRunConfig->freePorts().count();