From c308ec7b736b1e105803845c2b15599bd1c0a7c6 Mon Sep 17 00:00:00 2001 From: Vladislav Tronko Date: Wed, 15 Mar 2017 18:56:40 +0200 Subject: [PATCH 1/3] Fix system options not being retained after restart Auto-suspend unmodified files checkbox was always checked after restart, and min files to keep opened was set to 30. Change-Id: I7f52fee41155188ee8389e922fdc265f8c0a6459 Task-number: QTCREATORBUG-17844 Reviewed-by: Eike Ziller --- src/plugins/coreplugin/editormanager/editormanager.cpp | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/plugins/coreplugin/editormanager/editormanager.cpp b/src/plugins/coreplugin/editormanager/editormanager.cpp index 1f103bdcd53..e4d005e3fec 100644 --- a/src/plugins/coreplugin/editormanager/editormanager.cpp +++ b/src/plugins/coreplugin/editormanager/editormanager.cpp @@ -1036,6 +1036,12 @@ void EditorManagerPrivate::readSettings() d->m_autoSaveEnabled = qs->value(autoSaveEnabledKey).toBool(); d->m_autoSaveInterval = qs->value(autoSaveIntervalKey).toInt(); } + + if (qs->contains(autoSuspendEnabledKey)) { + d->m_autoSuspendEnabled = qs->value(autoSuspendEnabledKey).toBool(); + d->m_autoSuspendMinDocumentCount = qs->value(autoSuspendMinDocumentCountKey).toInt(); + } + updateAutoSave(); } From 262141a0dc74f30f435d929f96bcf6e1162d1743 Mon Sep 17 00:00:00 2001 From: Robert Loehning Date: Mon, 20 Mar 2017 14:21:55 +0100 Subject: [PATCH 2/3] Squish: Make workaround permanent in tst_simple_debug The fix is in 4.3 Task-number: QTCREATORBUG-17492 Change-Id: If155bd9b16a119e7b91161788708c21653222f8d Reviewed-by: Christian Stenger --- tests/system/shared/debugger.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/tests/system/shared/debugger.py b/tests/system/shared/debugger.py index 13f22f4a22b..74ea190a303 100644 --- a/tests/system/shared/debugger.py +++ b/tests/system/shared/debugger.py @@ -128,8 +128,7 @@ def doSimpleDebugging(kitCount, currentKit, currentConfigName, pressContinueCoun expectedLabelTexts = ['Stopped\.', 'Stopped at breakpoint \d+ \(\d+\) in thread \d+\.'] if len(expectedBPOrder) == 0: expectedLabelTexts.append("Running\.") - if JIRA.isBugStillOpen(17492): - expectedLabelTexts.append("QML Debugger: Error: Unknown socket error 0") + expectedLabelTexts.append("QML Debugger: Error: Unknown socket error 0") switchViewTo(ViewConstants.PROJECTS) switchToBuildOrRunSettingsFor(kitCount, currentKit, ProjectSettings.RUN) ensureChecked(waitForObject("{container=':Qt Creator.scrollArea_QScrollArea' text='Enable QML' " From 991f5eb6a5699c07c6471fcd6c148e507c694adf Mon Sep 17 00:00:00 2001 From: hjk Date: Tue, 21 Mar 2017 11:14:10 +0100 Subject: [PATCH 3/3] Prepare for upcoming compile breakage Qt 5.9 is going to break source compatibility by making the QStringRef(QString *) constructor explicit. Since the use of that constructor rather looks unintentional here, replace its use. Change-Id: I6f5f2e79f7d92f6e80a1ea0aa12126d9c88b499e Reviewed-by: Jochen Becher Reviewed-by: Eike Ziller --- src/libs/modelinglib/qmt/diagram_scene/items/classitem.cpp | 2 +- src/libs/utils/stringutils.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/libs/modelinglib/qmt/diagram_scene/items/classitem.cpp b/src/libs/modelinglib/qmt/diagram_scene/items/classitem.cpp index 87354577fba..276176a6917 100644 --- a/src/libs/modelinglib/qmt/diagram_scene/items/classitem.cpp +++ b/src/libs/modelinglib/qmt/diagram_scene/items/classitem.cpp @@ -628,7 +628,7 @@ void ClassItem::updateMembers(const Style *style) } *currentVisibility = member.visibility(); } - if (member.group() != currentGroup) { + if (currentGroup && member.group() != *currentGroup) { if (addSpace) *text += QStringLiteral(" "); *text += QString(QStringLiteral("[%1]")).arg(member.group()); diff --git a/src/libs/utils/stringutils.cpp b/src/libs/utils/stringutils.cpp index 3b2de69ec72..85813004dec 100644 --- a/src/libs/utils/stringutils.cpp +++ b/src/libs/utils/stringutils.cpp @@ -183,7 +183,7 @@ bool AbstractMacroExpander::expandNestedMacros(const QString &str, int *pos, QSt if (!expandNestedMacros(str, &i, ret)) return false; varName.chop(1); - varName += ret; + varName += *ret; } else if (currArg == &varName && c == '-' && prev == ':' && validateVarName(varName)) { varName.chop(1); currArg = &defaultValue;