feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

QmlDesigner: Work around yet another Qt deprecation warning

Browse Source 
Change-Id: I9a0bce549fac39b1aa180782ccb20bbe69967163
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
This commit is contained in:
hjk
2019-08-26 13:39:02 +02:00
parent 10d3772b7a
commit 2231080678
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp
View File

@@ -52,6 +52,7 @@
#include <qmljs/qmljsinterpreter.h> #include <qmljs/qmljsinterpreter.h>
#include <qmljs/qmljsvalueowner.h> #include <qmljs/qmljsvalueowner.h>
#include <utils/algorithm.h>
#include <utils/qrcparser.h> #include <utils/qrcparser.h>
#include <utils/qtcassert.h> #include <utils/qtcassert.h>
@@ -1122,7 +1123,7 @@ void TextToModelMerger::syncNode(ModelNode &modelNode,
context->enterScope(astNode); context->enterScope(astNode);
QSet<PropertyName> modelPropertyNames = QSet<PropertyName>::fromList(modelNode.propertyNames()); QSet<PropertyName> modelPropertyNames = Utils::toSet(modelNode.propertyNames());
if (!modelNode.id().isEmpty()) if (!modelNode.id().isEmpty())
modelPropertyNames.insert("id"); modelPropertyNames.insert("id");
QList<AST::UiObjectMember *> defaultPropertyItems; QList<AST::UiObjectMember *> defaultPropertyItems;