diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-03-28 01:00:34 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-03-28 01:00:36 +0100 |
| commit | ca8ce6b199e092f81e590d2e2bc21496cf601a15 (patch) | |
| tree | c57af35bc69492f931a06a67643052c8aeb100a0 /src/quick/items/qquickflickable.cpp | |
| parent | 0b2c04215dcdb0f209c46abe24c63deaaffc471c (diff) | |
| parent | d94bb1f6795302ef6eec795dd3ad92d60bd2aa4d (diff) | |
Merge remote-tracking branch 'origin/5.14' into 5.15
Change-Id: If7b3f7902eb18d586d8b721e77f4dfedc87cfb9a
Diffstat (limited to 'src/quick/items/qquickflickable.cpp')
| -rw-r--r-- | src/quick/items/qquickflickable.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/quick/items/qquickflickable.cpp b/src/quick/items/qquickflickable.cpp index c7f641cf1f..c91a5ef92b 100644 --- a/src/quick/items/qquickflickable.cpp +++ b/src/quick/items/qquickflickable.cpp @@ -1897,6 +1897,9 @@ void QQuickFlickable::cancelFlick() void QQuickFlickablePrivate::data_append(QQmlListProperty<QObject> *prop, QObject *o) { + if (!prop || !prop->data) + return; + if (QQuickItem *i = qmlobject_cast<QQuickItem *>(o)) { i->setParentItem(static_cast<QQuickFlickablePrivate*>(prop->data)->contentItem); } else if (QQuickPointerHandler *pointerHandler = qmlobject_cast<QQuickPointerHandler *>(o)) { |