summaryrefslogtreecommitdiff
path: root/src/plugins/qmldesigner
diff options
context:
space:
mode:
authorhjk <hjk@qt.io>2019-08-26 13:39:02 +0200
committerhjk <hjk@qt.io>2019-08-26 12:01:14 +0000
commit2231080678c2ed3563893ced184c888155abe8ce (patch)
treed7688dd2f8e2abe320ac4372f1db0933000d315f /src/plugins/qmldesigner
parent10d3772b7acfeda1b9ff49a343498e04670a80fc (diff)
downloadqt-creator-2231080678c2ed3563893ced184c888155abe8ce.tar.gz
QmlDesigner: Work around yet another Qt deprecation warning
Change-Id: I9a0bce549fac39b1aa180782ccb20bbe69967163 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Diffstat (limited to 'src/plugins/qmldesigner')
-rw-r--r--src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp b/src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp
index e48ee7e357..309b4e85a7 100644
--- a/src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp
+++ b/src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp
@@ -52,6 +52,7 @@
#include <qmljs/qmljsinterpreter.h>
#include <qmljs/qmljsvalueowner.h>
+#include <utils/algorithm.h>
#include <utils/qrcparser.h>
#include <utils/qtcassert.h>
@@ -1122,7 +1123,7 @@ void TextToModelMerger::syncNode(ModelNode &modelNode,
context->enterScope(astNode);
- QSet<PropertyName> modelPropertyNames = QSet<PropertyName>::fromList(modelNode.propertyNames());
+ QSet<PropertyName> modelPropertyNames = Utils::toSet(modelNode.propertyNames());
if (!modelNode.id().isEmpty())
modelPropertyNames.insert("id");
QList<AST::UiObjectMember *> defaultPropertyItems;