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

Prepare for upcoming compile breakage

Browse Source 
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 <jochen_becher@gmx.de>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
This commit is contained in:
hjk
2017-03-21 11:14:10 +01:00
parent 262141a0dc
commit 991f5eb6a5
2 changed files with 2 additions and 2 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

@@ -628,7 +628,7 @@ void ClassItem::updateMembers(const Style *style)
} }
*currentVisibility = member.visibility(); *currentVisibility = member.visibility();
} }
if (member.group() != currentGroup) { if (currentGroup && member.group() != *currentGroup) {
if (addSpace) if (addSpace)
*text += QStringLiteral(" "); *text += QStringLiteral(" ");
*text += QString(QStringLiteral("[%1]")).arg(member.group()); *text += QString(QStringLiteral("[%1]")).arg(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;