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

Maemo: Use ABI for determining the gdb architecture string.

Browse Source 
Can't use MADDE, because it is outdated.

Reviewed-by: Tobias Hunger
Task-number: QTCREATORBUG-4299
This commit is contained in:
Christian Kandeler
2011-04-13 15:10:46 +02:00
parent 433f3d17f5
commit 4097591301
1 changed files with 11 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/plugins/qt4projectmanager/qt-maemo/qt4maemotarget.cpp
View File

@@ -42,9 +42,11 @@
#include <coreplugin/icore.h> #include <coreplugin/icore.h>
#include <coreplugin/iversioncontrol.h> #include <coreplugin/iversioncontrol.h>
#include <coreplugin/vcsmanager.h> #include <coreplugin/vcsmanager.h>
#include <projectexplorer/abi.h>
#include <projectexplorer/customexecutablerunconfiguration.h> #include <projectexplorer/customexecutablerunconfiguration.h>
#include <projectexplorer/projectexplorer.h> #include <projectexplorer/projectexplorer.h>
#include <projectexplorer/projectnodes.h> #include <projectexplorer/projectnodes.h>
#include <projectexplorer/toolchain.h>
#include <qt4projectmanager/qt4project.h> #include <qt4projectmanager/qt4project.h>
#include <QtGui/QApplication> #include <QtGui/QApplication>
@@ -125,18 +127,15 @@ AbstractQt4MaemoTarget::~AbstractQt4MaemoTarget()
AbstractQt4MaemoTarget::DebugArchitecture AbstractQt4MaemoTarget::debugArchitecture() const AbstractQt4MaemoTarget::DebugArchitecture AbstractQt4MaemoTarget::debugArchitecture() const
{ {
const QString arch // TODO: This functionality should be inside the debugger.
= MaemoGlobal::architecture(activeBuildConfiguration()->qtVersion()); const ProjectExplorer::Abi &abi
if (arch.startsWith(QLatin1String("arm"))) { = activeBuildConfiguration()->toolChain()->targetAbi();
return DebugArchitecture(QLatin1String("arm"), DebugArchitecture arch(abi.toString());
QLatin1String("arm-none-linux-gnueabi"));
} else if (arch.startsWith(QLatin1String("x86_64"))) { // TODO: This might do the wrong thing for x64.
return DebugArchitecture(QLatin1String("i386:x86-64"), arch.gnuTarget = QLatin1String(abi.architecture() == ProjectExplorer::Abi::ArmArchitecture
QLatin1String("x86_64-unknown-linux-gnu ")); ? "arm-none-linux-gnueabi": "i386-unknown-linux-gnu");
} else { return arch;
return DebugArchitecture(QLatin1String("x86"),
QLatin1String("i386-unknown-linux-gnu "));
}
} }
QList<ProjectExplorer::ToolChain *> AbstractQt4MaemoTarget::possibleToolChains(ProjectExplorer::BuildConfiguration *bc) const QList<ProjectExplorer::ToolChain *> AbstractQt4MaemoTarget::possibleToolChains(ProjectExplorer::BuildConfiguration *bc) const