diff options
| author | Giuseppe D'Angelo <giuseppe.dangelo@kdab.com> | 2019-11-02 21:55:54 +0100 |
|---|---|---|
| committer | Giuseppe D'Angelo <giuseppe.dangelo@kdab.com> | 2019-12-16 13:54:19 +0100 |
| commit | bd18d2473f233b848d0d74a95b3dcf3a4297c044 (patch) | |
| tree | bf22045546e3e63a5dc4dfde5b89ea09af365297 /src/qml/qml/qqmlnotifier.cpp | |
| parent | e15517def6cc2a78b2fb9bb916d82aa0a32ffc20 (diff) | |
Port away from QObjectPrivate::getThreadData
It was a temporary measure to make merges possible; now use the
QObjectPrivate::threadData atomic directly. The code seems fine
with just relaxed semantics.
Change-Id: I257362b428a4d230295ebbe75bafa1c036fa69d7
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'src/qml/qml/qqmlnotifier.cpp')
| -rw-r--r-- | src/qml/qml/qqmlnotifier.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/qml/qml/qqmlnotifier.cpp b/src/qml/qml/qqmlnotifier.cpp index fe839a50dc..df3731684a 100644 --- a/src/qml/qml/qqmlnotifier.cpp +++ b/src/qml/qml/qqmlnotifier.cpp @@ -118,8 +118,8 @@ void QQmlNotifierEndpoint::connect(QObject *source, int sourceSignal, QQmlEngine disconnect(); Q_ASSERT(engine); - if (QObjectPrivate::get(source)->getThreadData()->threadId.loadRelaxed() != - QObjectPrivate::get(engine)->getThreadData()->threadId.loadRelaxed()) { + if (QObjectPrivate::get(source)->threadData.loadRelaxed()->threadId.loadRelaxed() != + QObjectPrivate::get(engine)->threadData.loadRelaxed()->threadId.loadRelaxed()) { QString sourceName; QDebug(&sourceName) << source; |