From 7c1f9fba8b02815fb5ff2b6d75a77ea271b66ec5 Mon Sep 17 00:00:00 2001
From: Lasse Holmstedt <lasse.holmstedt@nokia.com>
Date: Tue, 31 Aug 2010 16:48:51 +0200
Subject: Debugger: Disable auto switching of debugger languages based on
 qmlfiles

---
 src/plugins/debugger/debuggeruiswitcher.cpp | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

(limited to 'src/plugins/debugger/debuggeruiswitcher.cpp')

diff --git a/src/plugins/debugger/debuggeruiswitcher.cpp b/src/plugins/debugger/debuggeruiswitcher.cpp
index b10ece7bc7..a946c948f4 100644
--- a/src/plugins/debugger/debuggeruiswitcher.cpp
+++ b/src/plugins/debugger/debuggeruiswitcher.cpp
@@ -244,13 +244,12 @@ void DebuggerUISwitcher::updateUiForRunConfiguration(ProjectExplorer::RunConfigu
     bool isDotQmlProjectType = isQmlProjectType(rc);
     if (rc) {
         d->m_languageActionGroup->setDisabled(false);
-        if (DebuggerRunControl::isQmlProject(rc) && d->m_qmlEnabled) {
+        if (d->m_qmlEnabled) {
             d->m_activateCppAction->setChecked(!isDotQmlProjectType);
-            d->m_activateQmlAction->setChecked(true);
+            d->m_activateQmlAction->setChecked(isDotQmlProjectType);
         } else {
-            if (d->m_activateQmlAction) {
+            if (d->m_activateQmlAction)
                 d->m_activateQmlAction->setChecked(false);
-            }
         }
     } else {
         if (d->m_activateCppAction)
-- 
cgit v1.2.1