diff options
author | Christian Stenger <christian.stenger@qt.io> | 2020-04-24 06:47:17 +0200 |
---|---|---|
committer | Tim Jenssen <tim.jenssen@qt.io> | 2020-04-24 08:33:13 +0000 |
commit | 5d5cd15e1c40ee7f6f91f5718c7fcb4492a52d62 (patch) | |
tree | a863cd433b848dc47bd16f5216ed4f5ab5e19d8d /src/plugins/qmldesigner | |
parent | 6cfe0923010dff9a04ec56a2ea088c6cc7d8a739 (diff) |
QmlDesigner: Fix compile with gcc5.3
Amends 8d868d8bbb1742.
Change-Id: Ic8dd8829e6734031ddc49c75c778f3f6566a0acc
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
Diffstat (limited to 'src/plugins/qmldesigner')
-rw-r--r-- | src/plugins/qmldesigner/components/propertyeditor/propertyeditorqmlbackend.cpp | 10 | ||||
-rw-r--r-- | src/plugins/qmldesigner/components/stateseditor/stateseditorwidget.cpp | 4 |
2 files changed, 7 insertions, 7 deletions
diff --git a/src/plugins/qmldesigner/components/propertyeditor/propertyeditorqmlbackend.cpp b/src/plugins/qmldesigner/components/propertyeditor/propertyeditorqmlbackend.cpp index 42ad8857cf..ddded6400b 100644 --- a/src/plugins/qmldesigner/components/propertyeditor/propertyeditorqmlbackend.cpp +++ b/src/plugins/qmldesigner/components/propertyeditor/propertyeditorqmlbackend.cpp @@ -381,8 +381,8 @@ void PropertyEditorQmlBackend::setup(const QmlObjectNode &qmlObjectNode, const Q m_backendAnchorBinding.setup(qmlObjectNode.modelNode()); context()->setContextProperties( QVector<QQmlContext::PropertyPair>{ - {"anchorBackend", QVariant::fromValue(&m_backendAnchorBinding)}, - {"transaction", QVariant::fromValue(m_propertyEditorTransaction.data())} + {{"anchorBackend"}, QVariant::fromValue(&m_backendAnchorBinding)}, + {{"transaction"}, QVariant::fromValue(m_propertyEditorTransaction.data())} } ); @@ -462,9 +462,9 @@ void PropertyEditorQmlBackend::initialSetup(const TypeName &typeName, const QUrl context()->setContextProperties( QVector<QQmlContext::PropertyPair>{ - {"anchorBackend", QVariant::fromValue(&m_backendAnchorBinding)}, - {"modelNodeBackend", QVariant::fromValue(&m_backendModelNode)}, - {"transaction", QVariant::fromValue(m_propertyEditorTransaction.data())} + {{"anchorBackend"}, QVariant::fromValue(&m_backendAnchorBinding)}, + {{"modelNodeBackend"}, QVariant::fromValue(&m_backendModelNode)}, + {{"transaction"}, QVariant::fromValue(m_propertyEditorTransaction.data())} } ); diff --git a/src/plugins/qmldesigner/components/stateseditor/stateseditorwidget.cpp b/src/plugins/qmldesigner/components/stateseditor/stateseditorwidget.cpp index b3098b9360..dee2e86401 100644 --- a/src/plugins/qmldesigner/components/stateseditor/stateseditorwidget.cpp +++ b/src/plugins/qmldesigner/components/stateseditor/stateseditorwidget.cpp @@ -104,8 +104,8 @@ StatesEditorWidget::StatesEditorWidget(StatesEditorView *statesEditorView, State rootContext()->setContextProperties( QVector<QQmlContext::PropertyPair>{ - {"statesEditorModel", QVariant::fromValue(statesEditorModel)}, - {"canAddNewStates", true} + {{"statesEditorModel"}, QVariant::fromValue(statesEditorModel)}, + {{"canAddNewStates"}, true} } ); |