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

Compile fix for Qt 5.9

Browse Source 
This here is a trivial backport of 991f5eb6a5 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 <eike.ziller@qt.io>
This commit is contained in:
hjk
2017-09-04 10:17:38 +02:00
parent bc6f90cb2a
commit dd0621ac7d
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 (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

@@ -144,7 +144,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 { } else {
varName += c; varName += c;
} }