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

Have ToolChainManager::defaultDebugger() return a FileName

Browse Source 
Fix fallout of that change.

Change-Id: I2ba7187b232d17d03fecbea63fa68920bdafc5f2
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
This commit is contained in:
Tobias Hunger
2012-01-13 14:56:58 +01:00
parent 35e5f66dec
commit 2776346db4
6 changed files with 14 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/madde/maemotoolchain.cpp
View File

@@ -284,7 +284,7 @@ QList<ProjectExplorer::ToolChain *> MaemoToolChainFactory::createToolChainList(c
target = "Meego"; target = "Meego";
mTc->setDisplayName(tr("%1 GCC (%2)").arg(target).arg(MaemoGlobal::maddeRoot(mqv->qmakeCommand().toString()))); mTc->setDisplayName(tr("%1 GCC (%2)").arg(target).arg(MaemoGlobal::maddeRoot(mqv->qmakeCommand().toString())));
mTc->setCompilerPath(MaemoGlobal::targetRoot(mqv->qmakeCommand().toString()) + QLatin1String("/bin/gcc")); mTc->setCompilerPath(MaemoGlobal::targetRoot(mqv->qmakeCommand().toString()) + QLatin1String("/bin/gcc"));
mTc->setDebuggerCommand(ProjectExplorer::ToolChainManager::instance()->defaultDebugger(mqv->qtAbis().at(0))); mTc->setDebuggerCommand(ProjectExplorer::ToolChainManager::instance()->defaultDebugger(mqv->qtAbis().at(0)).toString());
if (mTc->debuggerCommand().isEmpty()) if (mTc->debuggerCommand().isEmpty())
mTc->setDebuggerCommand(MaemoGlobal::targetRoot(mqv->qmakeCommand().toString()) + QLatin1String("/bin/gdb")); mTc->setDebuggerCommand(MaemoGlobal::targetRoot(mqv->qmakeCommand().toString()) + QLatin1String("/bin/gdb"));
result.append(mTc); result.append(mTc);

6
src/plugins/projectexplorer/gcctoolchain.cpp
View File

@@ -630,7 +630,7 @@ QList<ToolChain *> Internal::GccToolChainFactory::autoDetectToolchains(const QSt
return result; return result;
} }
QString debuggerPath = ToolChainManager::instance()->defaultDebugger(requiredAbi); // Find the first debugger QString debuggerPath = ToolChainManager::instance()->defaultDebugger(requiredAbi).toString(); // Find the first debugger
if (debuggerPath.isEmpty()) { if (debuggerPath.isEmpty()) {
foreach (const QString &debugger, debuggers) { foreach (const QString &debugger, debuggers) {
debuggerPath = systemEnvironment.searchInPath(debugger); debuggerPath = systemEnvironment.searchInPath(debugger);
@@ -753,7 +753,7 @@ void Internal::GccToolChainConfigWidget::handleAbiChange()
{ {
if (m_autoDebuggerCommand == debuggerCommand()) { if (m_autoDebuggerCommand == debuggerCommand()) {
ProjectExplorer::Abi abi = m_abiWidget->currentAbi(); ProjectExplorer::Abi abi = m_abiWidget->currentAbi();
m_autoDebuggerCommand = ToolChainManager::instance()->defaultDebugger(abi); m_autoDebuggerCommand = ToolChainManager::instance()->defaultDebugger(abi).toString();
setDebuggerCommand(m_autoDebuggerCommand); setDebuggerCommand(m_autoDebuggerCommand);
} }
emit dirty(toolChain()); emit dirty(toolChain());
@@ -919,7 +919,7 @@ QList<ToolChain *> Internal::MingwToolChainFactory::autoDetect()
foreach (ToolChain *tc, ToolChainManager::instance()->toolChains()) { foreach (ToolChain *tc, ToolChainManager::instance()->toolChains()) {
if (tc->debuggerCommand().isEmpty() && tc->id().startsWith(QLatin1String(Constants::MINGW_TOOLCHAIN_ID))) if (tc->debuggerCommand().isEmpty() && tc->id().startsWith(QLatin1String(Constants::MINGW_TOOLCHAIN_ID)))
static_cast<MingwToolChain *>(tc) static_cast<MingwToolChain *>(tc)
->setDebuggerCommand(ToolChainManager::instance()->defaultDebugger(tc->targetAbi())); ->setDebuggerCommand(ToolChainManager::instance()->defaultDebugger(tc->targetAbi()).toString());
} }
Abi ha = Abi::hostAbi(); Abi ha = Abi::hostAbi();

7
src/plugins/projectexplorer/toolchainmanager.cpp
View File

@@ -77,7 +77,7 @@ class ToolChainManagerPrivate
{ {
public: public:
QList<ToolChain *> m_toolChains; QList<ToolChain *> m_toolChains;
QMap<QString, QString> m_abiToDebugger; QMap<QString, Utils::FileName> m_abiToDebugger;
}; };
} // namespace Internal } // namespace Internal
@@ -181,7 +181,8 @@ void ToolChainManager::restoreToolChains(const QString &fileName, bool autoDetec
const QString pathKey = QString::fromLatin1(DEFAULT_DEBUGGER_PATH_KEY) + QString::number(i); const QString pathKey = QString::fromLatin1(DEFAULT_DEBUGGER_PATH_KEY) + QString::number(i);
if (!data.contains(pathKey)) if (!data.contains(pathKey))
continue; continue;
d->m_abiToDebugger.insert(data.value(abiKey).toString(), data.value(pathKey).toString()); d->m_abiToDebugger.insert(data.value(abiKey).toString(),
Utils::FileName::fromString(data.value(pathKey).toString()));
} }
ExtensionSystem::PluginManager *pm = ExtensionSystem::PluginManager::instance(); ExtensionSystem::PluginManager *pm = ExtensionSystem::PluginManager::instance();
@@ -239,7 +240,7 @@ ToolChain *ToolChainManager::findToolChain(const QString &id) const
return 0; return 0;
} }
QString ToolChainManager::defaultDebugger(const Abi &abi) const Utils::FileName ToolChainManager::defaultDebugger(const Abi &abi) const
{ {
return d->m_abiToDebugger.value(abi.toString()); return d->m_abiToDebugger.value(abi.toString());
} }

4
src/plugins/projectexplorer/toolchainmanager.h
View File

@@ -35,6 +35,8 @@
#include "projectexplorer_export.h" #include "projectexplorer_export.h"
#include <utils/fileutils.h>
#include <QtCore/QList> #include <QtCore/QList>
#include <QtCore/QObject> #include <QtCore/QObject>
#include <QtCore/QString> #include <QtCore/QString>
@@ -65,7 +67,7 @@ public:
QList<ToolChain *> findToolChains(const Abi &abi) const; QList<ToolChain *> findToolChains(const Abi &abi) const;
ToolChain *findToolChain(const QString &id) const; ToolChain *findToolChain(const QString &id) const;
QString defaultDebugger(const Abi &abi) const; Utils::FileName defaultDebugger(const Abi &abi) const;
public slots: public slots:
bool registerToolChain(ProjectExplorer::ToolChain *tc); bool registerToolChain(ProjectExplorer::ToolChain *tc);

4
src/plugins/qt4projectmanager/qt-s60/gccetoolchain.cpp
View File

@@ -182,7 +182,7 @@ QList<ProjectExplorer::ToolChain *> GcceToolChainFactory::autoDetect()
GcceToolChain *tc = new GcceToolChain(false); GcceToolChain *tc = new GcceToolChain(false);
tc->setCompilerPath(fi.absoluteFilePath()); tc->setCompilerPath(fi.absoluteFilePath());
tc->setDisplayName(tr("GCCE from Qt version")); tc->setDisplayName(tr("GCCE from Qt version"));
tc->setDebuggerCommand(ProjectExplorer::ToolChainManager::instance()->defaultDebugger(tc->targetAbi())); tc->setDebuggerCommand(ProjectExplorer::ToolChainManager::instance()->defaultDebugger(tc->targetAbi()).toString());
result.append(tc); result.append(tc);
} }
} }
@@ -194,7 +194,7 @@ QList<ProjectExplorer::ToolChain *> GcceToolChainFactory::autoDetect()
GcceToolChain *tc = new GcceToolChain(true); GcceToolChain *tc = new GcceToolChain(true);
tc->setCompilerPath(fullPath); tc->setCompilerPath(fullPath);
tc->setDisplayName(tr("GCCE (%1)").arg(version)); tc->setDisplayName(tr("GCCE (%1)").arg(version));
tc->setDebuggerCommand(ProjectExplorer::ToolChainManager::instance()->defaultDebugger(tc->targetAbi())); tc->setDebuggerCommand(ProjectExplorer::ToolChainManager::instance()->defaultDebugger(tc->targetAbi()).toString());
if (tc->targetAbi() == ProjectExplorer::Abi(ProjectExplorer::Abi::ArmArchitecture, if (tc->targetAbi() == ProjectExplorer::Abi(ProjectExplorer::Abi::ArmArchitecture,
ProjectExplorer::Abi::SymbianOS, ProjectExplorer::Abi::SymbianOS,
ProjectExplorer::Abi::SymbianDeviceFlavor, ProjectExplorer::Abi::SymbianDeviceFlavor,

2
src/plugins/qt4projectmanager/qt-s60/rvcttoolchain.cpp
View File

@@ -554,7 +554,7 @@ QList<ProjectExplorer::ToolChain *> RvctToolChainFactory::autoDetect()
tc->setDisplayName(name.arg(armVersionString(tc->armVersion())) tc->setDisplayName(name.arg(armVersionString(tc->armVersion()))
.arg(v.majorVersion).arg(v.minorVersion).arg(v.build)); .arg(v.majorVersion).arg(v.minorVersion).arg(v.build));
tc->setVersion(v); tc->setVersion(v);
tc->setDebuggerCommand(ProjectExplorer::ToolChainManager::instance()->defaultDebugger(tc->targetAbi())); tc->setDebuggerCommand(ProjectExplorer::ToolChainManager::instance()->defaultDebugger(tc->targetAbi()).toString());
result.append(tc); result.append(tc);
} }