aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorhjk <hjk@qt.io>2017-03-21 11:14:10 +0100
committerhjk <hjk@qt.io>2017-03-22 08:25:13 +0000
commit991f5eb6a5699c07c6471fcd6c148e507c694adf (patch)
tree472938a5496bc127486ac3174edf9c3e54e59aff
parent262141a0dc74f30f435d929f96bcf6e1162d1743 (diff)
Prepare for upcoming compile breakagev4.2.2
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: Jochen Becher <jochen_becher@gmx.de> 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..276176a691 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 (currentGroup && 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 3b2de69ec7..85813004de 100644
--- a/src/libs/utils/stringutils.cpp
+++ b/src/libs/utils/stringutils.cpp
@@ -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;