diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-05-26 01:00:14 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-05-26 01:00:14 +0200 |
| commit | 9ff4c5c2168fcc616770389ee826190708258114 (patch) | |
| tree | 2db3d972e2a6e2bf16cf0280e074ffa00aaa55f1 /src/qml/types/qqmllistmodel.cpp | |
| parent | 30b3b8a7603a9963d17cf8520fda7252841cda91 (diff) | |
| parent | 9a44e3b6ca81f0e84d774a95e45b449b5d4cb583 (diff) | |
Merge remote-tracking branch 'origin/5.11' into dev
Change-Id: I626068886d4440b569dbeb1789b1ebfa480000c5
Diffstat (limited to 'src/qml/types/qqmllistmodel.cpp')
| -rw-r--r-- | src/qml/types/qqmllistmodel.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/qml/types/qqmllistmodel.cpp b/src/qml/types/qqmllistmodel.cpp index 10066ae84a..e92e27ab62 100644 --- a/src/qml/types/qqmllistmodel.cpp +++ b/src/qml/types/qqmllistmodel.cpp @@ -1463,8 +1463,8 @@ void ModelNodeMetaObject::emitDirectNotifies(const int *changedRoles, int roleCo QQmlData *ddata = QQmlData::get(object(), /*create*/false); if (!ddata) return; - QQmlEnginePrivate *ep = QQmlEnginePrivate::get(qmlEngine(m_model)); - if (!ep) + // There's nothing to emit if we're a list model in a worker thread. + if (!qmlEngine(m_model)) return; for (int i = 0; i < roleCount; ++i) { const int changedRole = changedRoles[i]; |