From 4dbb6ecd84e9c2848a5636d86ae43d63217eb158 Mon Sep 17 00:00:00 2001
From: hjk <hjk@theqtcompany.com>
Date: Fri, 29 Apr 2016 19:05:08 +0200
Subject: [PATCH] Android/Debugger: Always extract GDB version from binary
Change-Id: I19ab6e70a273e803b9755966e15253e006df3940
Reviewed-by: BogDan Vatra <bogdan@kdab.com>
---
src/plugins/android/androidconfigurations.cpp | 2 ++
src/plugins/debugger/debuggeritem.h | 3 ++-
2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/src/plugins/android/androidconfigurations.cpp b/src/plugins/android/androidconfigurations.cpp
index 8221bb5e40b..bac863f2f64 100644
--- a/src/plugins/android/androidconfigurations.cpp
+++ b/src/plugins/android/androidconfigurations.cpp
@@ -1288,6 +1288,7 @@ void AndroidConfigurations::updateAutomaticKitList()
debugger.setUnexpandedDisplayName(tr("Android Debugger for %1").arg(tc->displayName()));
debugger.setAutoDetected(true);
debugger.setAbi(tc->targetAbi());
+ debugger.reinitializeFromFile();
QVariant id = Debugger::DebuggerItemManager::registerDebugger(debugger);
Debugger::DebuggerKitInformation::setDebugger(k, id);
}
@@ -1334,6 +1335,7 @@ void AndroidConfigurations::updateAutomaticKitList()
debugger.setUnexpandedDisplayName(tr("Android Debugger for %1").arg(tc->displayName()));
debugger.setAutoDetected(true);
debugger.setAbi(tc->targetAbi());
+ debugger.reinitializeFromFile();
QVariant id = Debugger::DebuggerItemManager::registerDebugger(debugger);
Debugger::DebuggerKitInformation::setDebugger(newKit, id);
diff --git a/src/plugins/debugger/debuggeritem.h b/src/plugins/debugger/debuggeritem.h
index 2e0e6ea5af0..dea0a30ff6d 100644
--- a/src/plugins/debugger/debuggeritem.h
+++ b/src/plugins/debugger/debuggeritem.h
@@ -101,9 +101,10 @@ public:
bool operator==(const DebuggerItem &other) const;
bool operator!=(const DebuggerItem &other) const { return !operator==(other); }
+ void reinitializeFromFile();
+
private:
DebuggerItem(const QVariant &id);
- void reinitializeFromFile();
void initMacroExpander();
QVariant m_id;
--
GitLab