summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThiago Macieira <thiago.macieira@intel.com>2020-05-02 18:39:10 -0700
committerVolker Hilsheimer <volker.hilsheimer@qt.io>2020-05-20 14:12:14 +0200
commita11be67255140abd48f91a3d5f7ae4c3ee8e4341 (patch)
tree7f7e814a4758d37db9155eeaf096763f0af17dcd
parentcc1239fd22b9de56ca13204f4ec67a50032e808a (diff)
Fix warning that the QQmlListProperty constructor is deprecated
Use the one that isn't deprecated. invokedservices.cpp:119:12: warning: 'QQmlListProperty' is deprecated: Use constructor taking QList pointer, and gain improved performance [- Wdeprecated-declarations] Change-Id: I99ab0f318b1c43b89888fffd160b5b4521f09ca9 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> (cherry picked from commit 777bcea74700d22a11d958b1eadc87669116a9ea) Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
-rw-r--r--src/imports/scxmlstatemachine/invokedservices.cpp2
-rw-r--r--src/imports/scxmlstatemachine/statemachineextended.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/imports/scxmlstatemachine/invokedservices.cpp b/src/imports/scxmlstatemachine/invokedservices.cpp
index 6011557..5bdb4f0 100644
--- a/src/imports/scxmlstatemachine/invokedservices.cpp
+++ b/src/imports/scxmlstatemachine/invokedservices.cpp
@@ -116,7 +116,7 @@ void QScxmlInvokedServices::setStateMachine(QScxmlStateMachine *stateMachine)
QQmlListProperty<QObject> QScxmlInvokedServices::qmlChildren()
{
- return QQmlListProperty<QObject>(this, m_qmlChildren);
+ return QQmlListProperty<QObject>(this, &m_qmlChildren);
}
diff --git a/src/imports/scxmlstatemachine/statemachineextended.cpp b/src/imports/scxmlstatemachine/statemachineextended.cpp
index 6b1b13b..4434931 100644
--- a/src/imports/scxmlstatemachine/statemachineextended.cpp
+++ b/src/imports/scxmlstatemachine/statemachineextended.cpp
@@ -51,7 +51,7 @@ QScxmlStateMachineExtended::QScxmlStateMachineExtended(QObject *extendee) :
QQmlListProperty<QObject> QScxmlStateMachineExtended::children()
{
- return QQmlListProperty<QObject>(this, m_children);
+ return QQmlListProperty<QObject>(this, &m_children);
}
QT_END_NAMESPACE