From 5d5cd15e1c40ee7f6f91f5718c7fcb4492a52d62 Mon Sep 17 00:00:00 2001 From: Christian Stenger Date: Fri, 24 Apr 2020 06:47:17 +0200 Subject: [PATCH] QmlDesigner: Fix compile with gcc5.3 Amends 8d868d8bbb1742. Change-Id: Ic8dd8829e6734031ddc49c75c778f3f6566a0acc Reviewed-by: Tim Jenssen --- .../propertyeditor/propertyeditorqmlbackend.cpp | 10 +++++----- .../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 42ad8857cf0..ddded6400bd 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{ - {"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{ - {"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 b3098b93604..dee2e864013 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{ - {"statesEditorModel", QVariant::fromValue(statesEditorModel)}, - {"canAddNewStates", true} + {{"statesEditorModel"}, QVariant::fromValue(statesEditorModel)}, + {{"canAddNewStates"}, true} } );