feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Maemo: Remove unneeded reference to MaemoToolchain.

Browse Source
This commit is contained in:
Christian Kandeler
2011-04-26 15:01:11 +02:00
parent a03de5f717
commit b7531ac3d0
4 changed files with 3 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/qt4projectmanager/qt-maemo/maemodebugsupport.cpp
View File

@@ -68,7 +68,7 @@ RunControl *MaemoDebugSupport::createDebugRunControl(MaemoRunConfiguration *runC
} }
if (debuggingType != MaemoRunConfiguration::DebugQmlOnly) { if (debuggingType != MaemoRunConfiguration::DebugQmlOnly) {
params.processArgs = runConfig->arguments(); params.processArgs = runConfig->arguments();
params.sysRoot = runConfig->sysRoot(); params.sysRoot = runConfig->activeQt4BuildConfiguration()->qtVersion()->systemRoot();
params.toolChainAbi = runConfig->abi(); params.toolChainAbi = runConfig->abi();
if (runConfig->useRemoteGdb()) { if (runConfig->useRemoteGdb()) {
params.startMode = StartRemoteGdb; params.startMode = StartRemoteGdb;

16
src/plugins/qt4projectmanager/qt-maemo/maemorunconfiguration.cpp
View File

@@ -217,15 +217,6 @@ MaemoDeviceConfig::ConstPtr MaemoRunConfiguration::deviceConfig() const
return step ? step->helper().deviceConfig() : MaemoDeviceConfig::ConstPtr(); return step ? step->helper().deviceConfig() : MaemoDeviceConfig::ConstPtr();
} }
const MaemoToolChain *MaemoRunConfiguration::toolchain() const
{
Qt4BuildConfiguration *qt4bc(activeQt4BuildConfiguration());
QTC_ASSERT(qt4bc, return 0);
MaemoToolChain *tc = dynamic_cast<MaemoToolChain *>(qt4bc->toolChain());
QTC_ASSERT(tc != 0, return 0);
return tc;
}
const QString MaemoRunConfiguration::gdbCmd() const const QString MaemoRunConfiguration::gdbCmd() const
{ {
return QDir::toNativeSeparators(activeBuildConfiguration()->toolChain()->debuggerCommand()); return QDir::toNativeSeparators(activeBuildConfiguration()->toolChain()->debuggerCommand());
@@ -241,13 +232,6 @@ AbstractLinuxDeviceDeployStep *MaemoRunConfiguration::deployStep() const
return MaemoGlobal::earlierBuildStep<AbstractLinuxDeviceDeployStep>(deployConfig(), 0); return MaemoGlobal::earlierBuildStep<AbstractLinuxDeviceDeployStep>(deployConfig(), 0);
} }
const QString MaemoRunConfiguration::sysRoot() const
{
if (const MaemoToolChain *tc = toolchain())
return tc->sysroot();
return QString();
}
const QString MaemoRunConfiguration::targetRoot() const const QString MaemoRunConfiguration::targetRoot() const
{ {
QTC_ASSERT(activeQt4BuildConfiguration(), return QString()); QTC_ASSERT(activeQt4BuildConfiguration(), return QString());

2
src/plugins/qt4projectmanager/qt-maemo/maemorunconfiguration.h
View File

@@ -91,10 +91,8 @@ public:
Qt4MaemoDeployConfiguration *deployConfig() const; Qt4MaemoDeployConfiguration *deployConfig() const;
MaemoRemoteMountsModel *remoteMounts() const { return m_remoteMounts; } MaemoRemoteMountsModel *remoteMounts() const { return m_remoteMounts; }
const MaemoToolChain *toolchain() const;
QString localExecutableFilePath() const; QString localExecutableFilePath() const;
QString remoteExecutableFilePath() const; QString remoteExecutableFilePath() const;
const QString sysRoot() const;
const QString targetRoot() const; const QString targetRoot() const;
const QString arguments() const; const QString arguments() const;
void setArguments(const QString &args); void setArguments(const QString &args);

3
src/plugins/qt4projectmanager/qt-maemo/maemorunfactories.cpp
View File

@@ -163,7 +163,8 @@ bool MaemoRunControlFactory::canRun(RunConfiguration *runConfiguration,
const MaemoRunConfiguration * const maemoRunConfig const MaemoRunConfiguration * const maemoRunConfig
= qobject_cast<MaemoRunConfiguration *>(runConfiguration); = qobject_cast<MaemoRunConfiguration *>(runConfiguration);
if (!maemoRunConfig if (!maemoRunConfig
|| !maemoRunConfig->deviceConfig() || !maemoRunConfig->toolchain() || !maemoRunConfig->deviceConfig()
|| !maemoRunConfig->activeQt4BuildConfiguration()
|| maemoRunConfig->remoteExecutableFilePath().isEmpty()) || maemoRunConfig->remoteExecutableFilePath().isEmpty())
return false; return false;
const int freePortCount = maemoRunConfig->freePorts().count(); const int freePortCount = maemoRunConfig->freePorts().count();