From 538d5bdf662f4198a2d6c38a6002abb81433fb29 Mon Sep 17 00:00:00 2001 From: Giuseppe D'Angelo Date: Fri, 18 Oct 2019 13:26:02 +0200 Subject: [PATCH] Add a getter for QObjectPrivate::threadData Strictly a temporary measure to deal with cross-module merges. Change-Id: I344bb3f20f68f04367041834e608669122ff70b1 Reviewed-by: Thiago Macieira --- src/corelib/kernel/qobject_p.h | 1 + 1 file changed, 1 insertion(+) diff --git a/src/corelib/kernel/qobject_p.h b/src/corelib/kernel/qobject_p.h index feafcaf323..45fc27917d 100644 --- a/src/corelib/kernel/qobject_p.h +++ b/src/corelib/kernel/qobject_p.h @@ -374,6 +374,7 @@ public: } public: ExtraData *extraData; // extra data set by the user + QThreadData *getThreadData() const { return threadData; } QThreadData *threadData; // id of the thread that owns the object using ConnectionDataPointer = QExplicitlySharedDataPointer;