Android: Reset debugger in existing kits

For users upgrading from a broken 3.0 beta installation

Change-Id: Ieecf38f74879d1efacbfd775ab29eba9e17a4c43
Reviewed-by: Daniel Teske <daniel.teske@digia.com>

1 files changed, 12 insertions, 0 deletions

diff --git a/src/plugins/android/androidconfigurations.cpp b/src/plugins/android/androidconfigurations.cpp
index 4b6df3fd5e..80d1c9451a 100644
--- a/src/plugins/android/androidconfigurations.cpp
+++ b/src/plugins/android/androidconfigurations.cpp
@@ -830,6 +830,18 @@ void AndroidConfigurations::updateAutomaticKitList()
         if (k->isSdkProvided())
             continue;
 
+        // Update code for 3.0 beta, which shipped with a bug for the debugger settings
+        ProjectExplorer::ToolChain *tc =ToolChainKitInformation::toolChain(k);
+        if (tc && Debugger::DebuggerKitInformation::debuggerCommand(k) != tc->suggestedDebugger()) {
+            Debugger::DebuggerItem debugger;
+            debugger.setCommand(tc->suggestedDebugger());
+            debugger.setEngineType(Debugger::GdbEngineType);
+            debugger.setDisplayName(tr("Android Debugger for %1").arg(tc->displayName()));
+            debugger.setAutoDetected(true);
+            debugger.setAbi(tc->targetAbi());
+            QVariant id = Debugger::DebuggerItemManager::registerDebugger(debugger);
+            Debugger::DebuggerKitInformation::setDebugger(k, id);
+        }
         existingKits << k;
     }