diff options
| author | The Qt Project <gerrit-noreply@qt-project.org> | 2019-11-25 14:49:13 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2019-11-25 14:49:13 +0000 |
| commit | bc1cae774ad8cc084a98cb37d363770efbde025c (patch) | |
| tree | aeb16a5fa9093632eba6143fe53ef1dad3e383a4 /src/corelib/kernel/qobject_p.h | |
| parent | 8d35ad8726f44c4e853b5a192203ffcbbd2476e1 (diff) | |
| parent | 26e876912435bdafbca2b425af43824d7ec5b876 (diff) | |
Merge "Merge remote-tracking branch 'origin/dev' into wip/cmake" into wip/cmake
Diffstat (limited to 'src/corelib/kernel/qobject_p.h')
| -rw-r--r-- | src/corelib/kernel/qobject_p.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/corelib/kernel/qobject_p.h b/src/corelib/kernel/qobject_p.h index 11ebba7787..db62c03b7a 100644 --- a/src/corelib/kernel/qobject_p.h +++ b/src/corelib/kernel/qobject_p.h @@ -362,6 +362,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<ConnectionData>; |