diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2017-03-22 10:21:59 +0100 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2017-03-22 10:21:59 +0100 |
| commit | 26e76d3387c4053a334a08d2b0ca22b9e4b18f6c (patch) | |
| tree | d8f8e307a28d02869225a75942757829ecfd0dbf | |
| parent | 505cf814b98194def4a5dcb4a62ae9998002049a (diff) | |
| parent | 991f5eb6a5699c07c6471fcd6c148e507c694adf (diff) | |
Merge remote-tracking branch 'origin/4.2' into 4.3
Conflicts:
src/libs/modelinglib/qmt/diagram_scene/items/classitem.cpp
Change-Id: Ic9215ea50fdbe71610da893cc7999cc1e65b0690
| -rw-r--r-- | src/libs/modelinglib/qmt/diagram_scene/items/classitem.cpp | 2 | ||||
| -rw-r--r-- | src/libs/utils/stringutils.cpp | 2 | ||||
| -rw-r--r-- | src/plugins/coreplugin/editormanager/editormanager.cpp | 6 | ||||
| -rw-r--r-- | tests/system/shared/debugger.py | 3 |
4 files changed, 9 insertions, 4 deletions
diff --git a/src/libs/modelinglib/qmt/diagram_scene/items/classitem.cpp b/src/libs/modelinglib/qmt/diagram_scene/items/classitem.cpp index 8f6c935417..f94666c6a9 100644 --- a/src/libs/modelinglib/qmt/diagram_scene/items/classitem.cpp +++ b/src/libs/modelinglib/qmt/diagram_scene/items/classitem.cpp @@ -589,7 +589,7 @@ void ClassItem::updateMembers(const Style *style) bool addSpace = false; if (currentVisibility) *currentVisibility = member.visibility(); - if (member.group() != currentGroup) { + if (currentGroup && member.group() != *currentGroup) { *text += QString(QStringLiteral("[%1]")).arg(member.group()); addNewline = true; *currentGroup = member.group(); diff --git a/src/libs/utils/stringutils.cpp b/src/libs/utils/stringutils.cpp index 3b2de69ec7..85813004de 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; diff --git a/src/plugins/coreplugin/editormanager/editormanager.cpp b/src/plugins/coreplugin/editormanager/editormanager.cpp index 53fd3ec9dc..0683a66ef4 100644 --- a/src/plugins/coreplugin/editormanager/editormanager.cpp +++ b/src/plugins/coreplugin/editormanager/editormanager.cpp @@ -1033,6 +1033,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(); } diff --git a/tests/system/shared/debugger.py b/tests/system/shared/debugger.py index 13f22f4a22..74ea190a30 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' " |