diff options
| author | Frederik Gladhorn <frederik.gladhorn@qt.io> | 2017-05-10 15:20:50 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@qt.io> | 2017-05-10 15:21:47 +0200 |
| commit | afcbdccbe7be5446f693a84cdf1886fe92a2e033 (patch) | |
| tree | 550d9ce3f11d95ee5a355f32a232c083cfe0304c /src/qml/qml/qqmlpropertycache.cpp | |
| parent | 23a3018fc6a1e650b7eb291009c20d46c9e5c9af (diff) | |
| parent | 7434d05cc102f27d36b8efccb4e37f20a4886ea9 (diff) | |
Merge remote-tracking branch 'origin/5.9.0' into 5.9
Contains the fix for tst_TouchMouse::hoverEnabled which has caused
numerous failures in the last few days.
Change-Id: I1e523087a53d1df0334d602e4125f5cddc9bf470
Diffstat (limited to 'src/qml/qml/qqmlpropertycache.cpp')
| -rw-r--r-- | src/qml/qml/qqmlpropertycache.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/qml/qml/qqmlpropertycache.cpp b/src/qml/qml/qqmlpropertycache.cpp index 88ce2fa1b9..d18159841c 100644 --- a/src/qml/qml/qqmlpropertycache.cpp +++ b/src/qml/qml/qqmlpropertycache.cpp @@ -970,8 +970,11 @@ int QQmlPropertyCache::originalClone(QObject *object, int index) QQmlData *data = QQmlData::get(object, false); if (data && data->propertyCache) { QQmlPropertyCache *cache = data->propertyCache; - while (cache->signal(index)->isCloned()) + QQmlPropertyData *sig = cache->signal(index); + while (sig && sig->isCloned()) { --index; + sig = cache->signal(index); + } } else { while (QMetaObjectPrivate::signal(object->metaObject(), index).attributes() & QMetaMethod::Cloned) --index; |