diff --git a/src/widgets/graphicsview/qgraphicsanchorlayout_p.cpp b/src/widgets/graphicsview/qgraphicsanchorlayout_p.cpp
index 1c63ed5243..e16b427448 100644
--- a/src/widgets/graphicsview/qgraphicsanchorlayout_p.cpp
+++ b/src/widgets/graphicsview/qgraphicsanchorlayout_p.cpp
@@ -2058,9 +2058,8 @@ QList<AnchorData *> getVariables(const QList<QSimplexConstraint *> &constraints)
     QSet<AnchorData *> variableSet;
     for (int i = 0; i < constraints.count(); ++i) {
         const QSimplexConstraint *c = constraints.at(i);
-        foreach (QSimplexVariable *var, c->variables.keys()) {
-            variableSet += static_cast<AnchorData *>(var);
-        }
+        for (auto it = c->variables.cbegin(), end = c->variables.cend(); it != end; ++it)
+            variableSet.insert(static_cast<AnchorData *>(it.key()));
     }
     return variableSet.toList();
 }
@@ -2546,7 +2545,8 @@ QGraphicsAnchorLayoutPrivate::getGraphParts(Orientation orientation)
             // remaining constraints.
             if (match) {
                 trunkConstraints += c;
-                trunkVariables += QSet<QSimplexVariable *>::fromList(c->variables.keys());
+                for (auto jt = c->variables.cbegin(), end = c->variables.cend(); jt != end; ++jt)
+                    trunkVariables.insert(jt.key());
                 it = remainingConstraints.erase(it);
                 dirty = true;
             } else {
diff --git a/src/widgets/graphicsview/qsimplex_p.cpp b/src/widgets/graphicsview/qsimplex_p.cpp
index b827ab1400..d4e2e2f922 100644
--- a/src/widgets/graphicsview/qsimplex_p.cpp
+++ b/src/widgets/graphicsview/qsimplex_p.cpp
@@ -153,9 +153,11 @@ bool QSimplex::setConstraints(const QList<QSimplexConstraint *> &newConstraints)
     // "variables" is a list that provides a stable, indexed list of all variables
     // used in this problem.
     QSet<QSimplexVariable *> variablesSet;
-    for (int i = 0; i < constraints.size(); ++i)
-        variablesSet += \
-            QSet<QSimplexVariable *>::fromList(constraints[i]->variables.keys());
+    for (int i = 0; i < constraints.size(); ++i) {
+        const auto &v = constraints.at(i)->variables;
+        for (auto it = v.cbegin(), end = v.cend(); it != end; ++it)
+            variablesSet.insert(it.key());
+    }
     variables = variablesSet.toList();
 
     // Set Variables reverse mapping