From dd0621ac7d5d53553f8b685d422d9826fca3deb1 Mon Sep 17 00:00:00 2001 From: hjk Date: Mon, 4 Sep 2017 10:17:38 +0200 Subject: Compile fix for Qt 5.9 This here is a trivial backport of 991f5eb6a5699 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 --- src/libs/modelinglib/qmt/diagram_scene/items/classitem.cpp | 2 +- src/libs/utils/stringutils.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/libs/modelinglib/qmt/diagram_scene/items/classitem.cpp b/src/libs/modelinglib/qmt/diagram_scene/items/classitem.cpp index 87354577fb..dd7108e0be 100644 --- a/src/libs/modelinglib/qmt/diagram_scene/items/classitem.cpp +++ b/src/libs/modelinglib/qmt/diagram_scene/items/classitem.cpp @@ -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()); diff --git a/src/libs/utils/stringutils.cpp b/src/libs/utils/stringutils.cpp index 58c3971a7f..491c883921 100644 --- a/src/libs/utils/stringutils.cpp +++ b/src/libs/utils/stringutils.cpp @@ -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; } -- cgit v1.2.1