feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Debugger UI: Don't write QML settings if QML debugging is disabled

Browse Source
This commit is contained in:
Lasse Holmstedt
2010-08-25 11:25:30 +02:00
parent 78658cb3d7
commit 86d0eb0830
1 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/plugins/debugger/debuggeruiswitcher.cpp
View File

@@ -651,7 +651,7 @@ void DebuggerUISwitcher::writeSettings() const
} }
settings->endGroup(); settings->endGroup();
} }
{ if (d->m_qmlEnabled) {
settings->beginGroup(QLatin1String("DebugMode.CppQmlMode")); settings->beginGroup(QLatin1String("DebugMode.CppQmlMode"));
QHashIterator<QString, QVariant> it(d->m_dockWidgetActiveStateQmlCpp); QHashIterator<QString, QVariant> it(d->m_dockWidgetActiveStateQmlCpp);
while (it.hasNext()) { while (it.hasNext()) {
@@ -674,21 +674,25 @@ void DebuggerUISwitcher::readSettings()
} }
settings->endGroup(); settings->endGroup();
if (d->m_qmlEnabled) {
settings->beginGroup(QLatin1String("DebugMode.CppQmlMode")); settings->beginGroup(QLatin1String("DebugMode.CppQmlMode"));
foreach (const QString &key, settings->childKeys()) { foreach (const QString &key, settings->childKeys()) {
d->m_dockWidgetActiveStateQmlCpp.insert(key, settings->value(key)); d->m_dockWidgetActiveStateQmlCpp.insert(key, settings->value(key));
} }
settings->endGroup(); settings->endGroup();
}
// reset initial settings when there are none yet // reset initial settings when there are none yet
if (d->m_dockWidgetActiveStateCpp.isEmpty() || d->m_dockWidgetActiveStateQmlCpp.isEmpty()) {
DebuggerLanguages langs = d->m_activeDebugLanguages; DebuggerLanguages langs = d->m_activeDebugLanguages;
d->m_activeDebugLanguages = QmlLanguage; if (d->m_dockWidgetActiveStateCpp.isEmpty()) {
resetDebuggerLayout();
d->m_activeDebugLanguages = CppLanguage; d->m_activeDebugLanguages = CppLanguage;
resetDebuggerLayout(); resetDebuggerLayout();
d->m_activeDebugLanguages = langs;
} }
if (d->m_qmlEnabled && d->m_dockWidgetActiveStateQmlCpp.isEmpty()) {
d->m_activeDebugLanguages = QmlLanguage;
resetDebuggerLayout();
}
d->m_activeDebugLanguages = langs;
} }
void DebuggerUISwitcher::initialize() void DebuggerUISwitcher::initialize()