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

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

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

Change-Id: Ic9215ea50fdbe71610da893cc7999cc1e65b0690
This commit is contained in:
Eike Ziller
2017-03-22 10:21:59 +01:00
parent 505cf814b9 991f5eb6a5
commit 26e76d3387
4 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/libs/modelinglib/qmt/diagram_scene/items/classitem.cpp
View File

@@ -589,7 +589,7 @@ void ClassItem::updateMembers(const Style *style)
bool addSpace = false; bool addSpace = false;
if (currentVisibility) if (currentVisibility)
*currentVisibility = member.visibility(); *currentVisibility = member.visibility();
if (member.group() != currentGroup) { if (currentGroup && member.group() != *currentGroup) {
*text += QString(QStringLiteral("[%1]")).arg(member.group()); *text += QString(QStringLiteral("[%1]")).arg(member.group());
addNewline = true; addNewline = true;
*currentGroup = member.group(); *currentGroup = member.group();

2
src/libs/utils/stringutils.cpp
View File

@@ -183,7 +183,7 @@ bool AbstractMacroExpander::expandNestedMacros(const QString &str, int *pos, QSt
if (!expandNestedMacros(str, &i, ret)) if (!expandNestedMacros(str, &i, ret))
return false; return false;
varName.chop(1); varName.chop(1);
varName += ret; varName += *ret;
} else if (currArg == &varName && c == '-' && prev == ':' && validateVarName(varName)) { } else if (currArg == &varName && c == '-' && prev == ':' && validateVarName(varName)) {
varName.chop(1); varName.chop(1);
currArg = &defaultValue; currArg = &defaultValue;

6
src/plugins/coreplugin/editormanager/editormanager.cpp
View File

@@ -1033,6 +1033,12 @@ void EditorManagerPrivate::readSettings()
d->m_autoSaveEnabled = qs->value(autoSaveEnabledKey).toBool(); d->m_autoSaveEnabled = qs->value(autoSaveEnabledKey).toBool();
d->m_autoSaveInterval = qs->value(autoSaveIntervalKey).toInt(); 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(); updateAutoSave();
} }

1
tests/system/shared/debugger.py
View File

@@ -128,7 +128,6 @@ def doSimpleDebugging(kitCount, currentKit, currentConfigName, pressContinueCoun
expectedLabelTexts = ['Stopped\.', 'Stopped at breakpoint \d+ \(\d+\) in thread \d+\.'] expectedLabelTexts = ['Stopped\.', 'Stopped at breakpoint \d+ \(\d+\) in thread \d+\.']
if len(expectedBPOrder) == 0: if len(expectedBPOrder) == 0:
expectedLabelTexts.append("Running\.") 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) switchViewTo(ViewConstants.PROJECTS)
switchToBuildOrRunSettingsFor(kitCount, currentKit, ProjectSettings.RUN) switchToBuildOrRunSettingsFor(kitCount, currentKit, ProjectSettings.RUN)