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

QmlDesigner: Fix compile with gcc5.3

Browse Source 
Amends 8d868d8bbb.

Change-Id: Ic8dd8829e6734031ddc49c75c778f3f6566a0acc
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
This commit is contained in:
Christian Stenger
2020-04-24 06:47:17 +02:00
committed by Tim Jenssen
parent 6cfe092301
commit 5d5cd15e1c
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/plugins/qmldesigner/components/propertyeditor/propertyeditorqmlbackend.cpp
View File

@@ -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())}
}
);

4
src/plugins/qmldesigner/components/stateseditor/stateseditorwidget.cpp
View File

@@ -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}
}
);