diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-04-11 11:12:18 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-04-11 11:12:18 +0200 |
| commit | 3480c2e0565eeb938fb6fb8ba1dad640fb0a0d12 (patch) | |
| tree | 47c6963467a3c20326adfebd3cc0c15063ef04ba /src/qml/qml/qqmlproperty.cpp | |
| parent | 90e7521313fc9e89d492d65f9ad0dca3c38e7225 (diff) | |
| parent | d438be92dd7068fef94ce98e1ec039fe0ef4f3b3 (diff) | |
Merge remote-tracking branch 'origin/5.8' into 5.9
Change-Id: Ib3d81ad33a6ba28d891da91271a64d5fcc4874e6
Diffstat (limited to 'src/qml/qml/qqmlproperty.cpp')
| -rw-r--r-- | src/qml/qml/qqmlproperty.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/qml/qml/qqmlproperty.cpp b/src/qml/qml/qqmlproperty.cpp index ca522c29af..9b5f7b0a06 100644 --- a/src/qml/qml/qqmlproperty.cpp +++ b/src/qml/qml/qqmlproperty.cpp @@ -1627,7 +1627,7 @@ QMetaMethod QQmlPropertyPrivate::findSignalByName(const QMetaObject *mo, const Q */ static inline void flush_vme_signal(const QObject *object, int index, bool indexInSignalRange) { - QQmlData *data = static_cast<QQmlData *>(QObjectPrivate::get(const_cast<QObject *>(object))->declarativeData); + QQmlData *data = QQmlData::get(object); if (data && data->propertyCache) { QQmlPropertyData *property = indexInSignalRange ? data->propertyCache->signal(index) : data->propertyCache->method(index); |