diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-02-15 03:04:58 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-02-15 03:04:59 +0100 |
| commit | ac0f95f6f1d54d689a5f6525b4636634106821f6 (patch) | |
| tree | dff8d25f1d8e589bc431e3189f65df5a59713e1b | |
| parent | 749ae042fec78042f8f5640e21aaaaae43869946 (diff) | |
| parent | 63c972ad9e15b673779147c4c263ed2ac5312a28 (diff) | |
Merge remote-tracking branch 'origin/5.15' into dev
Change-Id: I6fad4ad595ae4d0d5f00514bc785bfe69cd84954
| -rw-r--r-- | examples/sensors/sensor_explorer/import/explorer.cpp | 2 | ||||
| -rw-r--r-- | examples/sensors/sensor_explorer/import/sensoritem.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/examples/sensors/sensor_explorer/import/explorer.cpp b/examples/sensors/sensor_explorer/import/explorer.cpp index 4773ee18..0665a98f 100644 --- a/examples/sensors/sensor_explorer/import/explorer.cpp +++ b/examples/sensors/sensor_explorer/import/explorer.cpp @@ -117,7 +117,7 @@ void QSensorExplorer::loadSensors() */ QQmlListProperty<QSensorItem> QSensorExplorer::availableSensors() { - return QQmlListProperty<QSensorItem>(this,_availableSensors); + return QQmlListProperty<QSensorItem>(this, &_availableSensors); } /* diff --git a/examples/sensors/sensor_explorer/import/sensoritem.cpp b/examples/sensors/sensor_explorer/import/sensoritem.cpp index 88b5fa7c..f268db3a 100644 --- a/examples/sensors/sensor_explorer/import/sensoritem.cpp +++ b/examples/sensors/sensor_explorer/import/sensoritem.cpp @@ -325,7 +325,7 @@ QQmlListProperty<QPropertyInfo> QSensorItem::properties() _properties.clear(); _properties.append(_sensorProperties); _properties.append(_readerProperties); - return QQmlListProperty<QPropertyInfo> (this, _properties); + return QQmlListProperty<QPropertyInfo> (this, &_properties); } QT_END_NAMESPACE |