diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-02-17 20:10:34 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-02-17 20:10:34 +0100 |
| commit | bc4cd465dd5df82e13f3c7709166ee11289d219f (patch) | |
| tree | d6323aaed6383e589fbefb6057648c22bb187c76 /src/corelib/kernel/qobject.cpp | |
| parent | 43daefb0962794b2df256cae1098e889b9b36f12 (diff) | |
| parent | 07745d7bfbf6c8d83e0243150d8ce934675dea87 (diff) | |
Merge remote-tracking branch 'origin/5.9' into dev
Conflicts:
qmake/Makefile.unix
Change-Id: Ia18e391198222eef34ffa2df6f683e052058d032
Diffstat (limited to 'src/corelib/kernel/qobject.cpp')
| -rw-r--r-- | src/corelib/kernel/qobject.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/kernel/qobject.cpp b/src/corelib/kernel/qobject.cpp index 8088b18ef4a..8e906b278d5 100644 --- a/src/corelib/kernel/qobject.cpp +++ b/src/corelib/kernel/qobject.cpp @@ -3708,7 +3708,7 @@ void QMetaObject::activate(QObject *sender, int signalOffset, int local_signal_i continue; QObject * const receiver = c->receiver; - const bool receiverInSameThread = currentThreadId == receiver->d_func()->threadData->threadId; + const bool receiverInSameThread = currentThreadId == receiver->d_func()->threadData->threadId.load(); // determine if this connection should be sent immediately or // put into the event queue |