...
 
Commits (1)
  • hjk's avatar
    Compile fix for Qt 5.9 · dd0621ac
    hjk authored
    This here is a trivial backport of 991f5eb6 which doesn't
    apply cleanly due to renamings in that area.
    
    It is meant to help regression testing Qt Creator over a wider
    range of versions bridging the source compatibility breakage
    in change 821390b7c3a9438 in Qt Core.
    
    Change-Id: Ib6d06927dbe16f94b21caca0993f524b282f167a
    Reviewed-by: Eike Ziller's avatarEike Ziller <eike.ziller@qt.io>
    dd0621ac
......@@ -628,7 +628,7 @@ void ClassItem::updateMembers(const Style *style)
}
*currentVisibility = member.visibility();
}
if (member.group() != currentGroup) {
if (member.group() != *currentGroup) {
if (addSpace)
*text += QStringLiteral(" ");
*text += QString(QStringLiteral("[%1]")).arg(member.group());
......
......@@ -144,7 +144,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 {
varName += c;
}
......