summaryrefslogtreecommitdiffstats
path: root/src/kernel/qthread.h
diff options
context:
space:
mode:
authorDarrell Anderson <[email protected]>2012-12-19 14:03:09 -0600
committerDarrell Anderson <[email protected]>2012-12-19 14:03:09 -0600
commit35202ed0d899a9ff3c77dad72b501fb30e4dcf93 (patch)
tree683787f69d937483b860973ce17f0c5d430a142d /src/kernel/qthread.h
parent8d5add0e87ad913bdf0362a83f431995115f3bfa (diff)
parentf19aa203c934d0f85862fdf810a87fe7c5777d17 (diff)
downloadqt3-35202ed0d899a9ff3c77dad72b501fb30e4dcf93.tar.gz
qt3-35202ed0d899a9ff3c77dad72b501fb30e4dcf93.zip
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/qt3
Diffstat (limited to 'src/kernel/qthread.h')
-rw-r--r--src/kernel/qthread.h14
1 files changed, 14 insertions, 0 deletions
diff --git a/src/kernel/qthread.h b/src/kernel/qthread.h
index 160919f..0188ea6 100644
--- a/src/kernel/qthread.h
+++ b/src/kernel/qthread.h
@@ -118,11 +118,25 @@ protected:
private:
QThreadInstance * d;
friend class QThreadInstance;
+ friend class QCoreApplicationThread;
+ friend class QApplication;
+ friend class QEventLoop;
#if defined(Q_DISABLE_COPY)
QThread( const QThread & );
QThread &operator=( const QThread & );
#endif // Q_DISABLE_COPY
+
+public:
+ static QThread* currentThreadObject();
+};
+
+class Q_EXPORT QEventLoopThread : public QThread
+{
+ public:
+ QEventLoopThread();
+ ~QEventLoopThread();
+ virtual void run();
};
#endif // QT_THREAD_SUPPORT