From 1356a349cf89f6b6f88573929ffa9e956b223aaf Mon Sep 17 00:00:00 2001 From: Kai Koehne Date: Wed, 12 Oct 2011 12:48:56 +0200 Subject: [PATCH] Debugger: Initialize default layout for both QML and QML/CPP Change-Id: Ib52c1664f0273d573bed28b8640d77e5292d40e3 Reviewed-by: hjk --- src/plugins/debugger/debuggermainwindow.cpp | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/src/plugins/debugger/debuggermainwindow.cpp b/src/plugins/debugger/debuggermainwindow.cpp index 5186f9c2b8..fe434420ea 100644 --- a/src/plugins/debugger/debuggermainwindow.cpp +++ b/src/plugins/debugger/debuggermainwindow.cpp @@ -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(); } -- 2.11.0