Merge remote-tracking branch 'origin/4.2' into 4.3

Conflicts:
	src/libs/modelinglib/qmt/diagram_scene/items/classitem.cpp

Change-Id: Ic9215ea50fdbe71610da893cc7999cc1e65b0690

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();

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;

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();
 }
 

tests/system/shared/debugger.py

@@ -128,7 +128,6 @@ 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")
     switchViewTo(ViewConstants.PROJECTS)
     switchToBuildOrRunSettingsFor(kitCount, currentKit, ProjectSettings.RUN)