diff options
| author | Darrell Anderson <[email protected]> | 2012-12-19 14:03:09 -0600 |
|---|---|---|
| committer | Darrell Anderson <[email protected]> | 2012-12-19 14:03:09 -0600 |
| commit | 35202ed0d899a9ff3c77dad72b501fb30e4dcf93 (patch) | |
| tree | 683787f69d937483b860973ce17f0c5d430a142d /src/kernel/qobject.h | |
| parent | 8d5add0e87ad913bdf0362a83f431995115f3bfa (diff) | |
| parent | f19aa203c934d0f85862fdf810a87fe7c5777d17 (diff) | |
| download | qt3-35202ed0d899a9ff3c77dad72b501fb30e4dcf93.tar.gz qt3-35202ed0d899a9ff3c77dad72b501fb30e4dcf93.zip | |
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/qt3
Diffstat (limited to 'src/kernel/qobject.h')
| -rw-r--r-- | src/kernel/qobject.h | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/src/kernel/qobject.h b/src/kernel/qobject.h index 6de28db..2f469ba 100644 --- a/src/kernel/qobject.h +++ b/src/kernel/qobject.h @@ -63,6 +63,10 @@ class QObjectUserData; #endif struct QUObject; +#ifdef QT_THREAD_SUPPORT +class QThread; +#endif + class Q_EXPORT QObject: public Qt { Q_OBJECT @@ -217,6 +221,18 @@ private: // Disabled copy constructor and operator= QObject( const QObject & ); QObject &operator=( const QObject & ); #endif + +public: +#ifdef QT_THREAD_SUPPORT + QThread* contextThreadObject() const; + void moveToThread(QThread *targetThread); +#endif + +private: +#ifdef QT_THREAD_SUPPORT + void moveToThread_helper(QThread *targetThread); + void setThreadObject_helper(QThread *targetThread); +#endif }; |