diff options
Diffstat (limited to 'src/corelib/kernel/qobject.cpp')
| -rw-r--r-- | src/corelib/kernel/qobject.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/corelib/kernel/qobject.cpp b/src/corelib/kernel/qobject.cpp index 3254f2a9feb..e438c115135 100644 --- a/src/corelib/kernel/qobject.cpp +++ b/src/corelib/kernel/qobject.cpp @@ -2413,7 +2413,7 @@ void QObjectPrivate::setParent_helper(QObject *o) parent = o; if (parent) { // object hierarchies are constrained to a single thread - if (threadData != parent->d_func()->threadData) { + if (threadData.loadRelaxed() != parent->d_func()->threadData.loadRelaxed()) { qWarning("QObject::setParent: Cannot set parent, new parent is in a different thread"); parent = nullptr; return; @@ -2475,7 +2475,7 @@ void QObject::installEventFilter(QObject *obj) Q_D(QObject); if (!obj) return; - if (d->threadData != obj->d_func()->threadData) { + if (d->threadData.loadRelaxed() != obj->d_func()->threadData.loadRelaxed()) { qWarning("QObject::installEventFilter(): Cannot filter events for objects in a different thread."); return; } |
