Commit 991f5eb6 authored by hjk's avatar hjk

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: 's avatarJochen Becher <jochen_becher@gmx.de>
Reviewed-by: Eike Ziller's avatarEike Ziller <eike.ziller@qt.io>
parent 262141a0
......@@ -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());
......
......@@ -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;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment