OSDN Git Service

Debugger: Initialize default layout for both QML and QML/CPP
authorKai Koehne <kai.koehne@nokia.com>
Wed, 12 Oct 2011 10:48:56 +0000 (12:48 +0200)
committerKai Koehne <kai.koehne@nokia.com>
Wed, 12 Oct 2011 12:36:56 +0000 (14:36 +0200)
Change-Id: Ib52c1664f0273d573bed28b8640d77e5292d40e3
Reviewed-by: hjk <qthjk@ovi.com>
src/plugins/debugger/debuggermainwindow.cpp

index 5186f9c..fe43442 100644 (file)
@@ -555,18 +555,15 @@ void DebuggerMainWindow::readSettings()
     settings->endGroup();
 
     // Reset initial settings when there are none yet.
-    if (d->isQmlActive()) {
-        if (d->m_dockWidgetActiveStateQmlCpp.isEmpty()) {
-            d->m_activeDebugLanguages = DebuggerLanguage(QmlLanguage|CppLanguage);
-            d->setSimpleDockWidgetArrangement();
-            d->m_dockWidgetActiveStateCpp = saveSettings();
-        }
-    } else {
-        if (d->m_dockWidgetActiveStateCpp.isEmpty()) {
-            d->m_activeDebugLanguages = CppLanguage;
-            d->setSimpleDockWidgetArrangement();
-            d->m_dockWidgetActiveStateCpp = saveSettings();
-        }
+    if (d->m_dockWidgetActiveStateQmlCpp.isEmpty()) {
+        d->m_activeDebugLanguages = DebuggerLanguage(QmlLanguage|CppLanguage);
+        d->setSimpleDockWidgetArrangement();
+        d->m_dockWidgetActiveStateCpp = saveSettings();
+    }
+    if (d->m_dockWidgetActiveStateCpp.isEmpty()) {
+        d->m_activeDebugLanguages = CppLanguage;
+        d->setSimpleDockWidgetArrangement();
+        d->m_dockWidgetActiveStateCpp = saveSettings();
     }
     writeSettings();
 }