diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-03-13 07:10:51 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-03-13 07:29:03 +0100 |
| commit | 435774ced1f062645a2d48972ac4698c4741c1a7 (patch) | |
| tree | f54c53e361d724068aca48823778bd6425c0016b /src/qml/qml/qqmlengine.cpp | |
| parent | 77e0dc0485953427320ed0b442ba24eef4f9d73b (diff) | |
| parent | fb0490dd653e4856a3595bd7e49c3127215170d1 (diff) | |
Merge remote-tracking branch 'origin/5.8' into 5.9
Conflicts:
src/qml/qml/qqmlimport.cpp
Change-Id: I26f8d18fe8af664ee8573116f182fe12b71e089a
Diffstat (limited to 'src/qml/qml/qqmlengine.cpp')
| -rw-r--r-- | src/qml/qml/qqmlengine.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/qml/qml/qqmlengine.cpp b/src/qml/qml/qqmlengine.cpp index 86ad84b9c1..a762564912 100644 --- a/src/qml/qml/qqmlengine.cpp +++ b/src/qml/qml/qqmlengine.cpp @@ -791,7 +791,7 @@ void QQmlData::signalEmitted(QAbstractDeclarativeData *, QObject *object, int in // marshalled back onto the QObject's thread and handled by QML from there. This is tested // by the qqmlecmascript::threadSignal() autotest. if (ddata->notifyList && - QThread::currentThreadId() != QObjectPrivate::get(object)->threadData->threadId) { + QThread::currentThreadId() != QObjectPrivate::get(object)->threadData->threadId.load()) { if (!QObjectPrivate::get(object)->threadData->thread) return; |