summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorhjk <hjk@qt.io>2017-09-04 10:17:38 +0200
committerhjk <hjk@qt.io>2017-09-04 11:13:26 +0000
commitdd0621ac7d5d53553f8b685d422d9826fca3deb1 (patch)
tree4ffecb0064a39d65712f883f604282a458511e3f
parentbc6f90cb2a811269d3559c948ad4e7dce7757c63 (diff)
downloadqt-creator-4.1.tar.gz
Compile fix for Qt 5.94.1
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 <eike.ziller@qt.io>
-rw-r--r--src/libs/modelinglib/qmt/diagram_scene/items/classitem.cpp2
-rw-r--r--src/libs/utils/stringutils.cpp2
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;
}