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

Android/Debugger: Always extract GDB version from binary

Browse Source 
Change-Id: I19ab6e70a273e803b9755966e15253e006df3940
Reviewed-by: BogDan Vatra <bogdan@kdab.com>
This commit is contained in:
hjk
2016-04-29 19:05:08 +02:00
parent 05739d1d6b
commit 4dbb6ecd84
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/android/androidconfigurations.cpp
View File

@@ -1288,6 +1288,7 @@ void AndroidConfigurations::updateAutomaticKitList()
debugger.setUnexpandedDisplayName(tr("Android Debugger for %1").arg(tc->displayName())); debugger.setUnexpandedDisplayName(tr("Android Debugger for %1").arg(tc->displayName()));
debugger.setAutoDetected(true); debugger.setAutoDetected(true);
debugger.setAbi(tc->targetAbi()); debugger.setAbi(tc->targetAbi());
debugger.reinitializeFromFile();
QVariant id = Debugger::DebuggerItemManager::registerDebugger(debugger); QVariant id = Debugger::DebuggerItemManager::registerDebugger(debugger);
Debugger::DebuggerKitInformation::setDebugger(k, id); Debugger::DebuggerKitInformation::setDebugger(k, id);
} }
@@ -1334,6 +1335,7 @@ void AndroidConfigurations::updateAutomaticKitList()
debugger.setUnexpandedDisplayName(tr("Android Debugger for %1").arg(tc->displayName())); debugger.setUnexpandedDisplayName(tr("Android Debugger for %1").arg(tc->displayName()));
debugger.setAutoDetected(true); debugger.setAutoDetected(true);
debugger.setAbi(tc->targetAbi()); debugger.setAbi(tc->targetAbi());
debugger.reinitializeFromFile();
QVariant id = Debugger::DebuggerItemManager::registerDebugger(debugger); QVariant id = Debugger::DebuggerItemManager::registerDebugger(debugger);
Debugger::DebuggerKitInformation::setDebugger(newKit, id); Debugger::DebuggerKitInformation::setDebugger(newKit, id);

3
src/plugins/debugger/debuggeritem.h
View File

@@ -101,9 +101,10 @@ public:
bool operator==(const DebuggerItem &other) const; bool operator==(const DebuggerItem &other) const;
bool operator!=(const DebuggerItem &other) const { return !operator==(other); } bool operator!=(const DebuggerItem &other) const { return !operator==(other); }
void reinitializeFromFile();
private: private:
DebuggerItem(const QVariant &id); DebuggerItem(const QVariant &id);
void reinitializeFromFile();
void initMacroExpander(); void initMacroExpander();
QVariant m_id; QVariant m_id;