diff options
| author | Harald Fernengel <harald@trolltech.com> | 2009-06-26 11:35:16 +0200 |
|---|---|---|
| committer | Jason Barron <jbarron@trolltech.com> | 2009-06-29 14:07:00 +0200 |
| commit | f1d3ed3a4adc2f1859102afb03b5c794d569940c (patch) | |
| tree | a27602762705501c80fe689aac23c376612aa77e /src/corelib/thread/qthread_p.h | |
| parent | db8f05e257019694f5e8076845626008f2adc3dd (diff) | |
| download | qt4-tools-f1d3ed3a4adc2f1859102afb03b5c794d569940c.tar.gz | |
Manually fix bad merges and make sure everything compiles with 4.6.
Diffstat (limited to 'src/corelib/thread/qthread_p.h')
| -rw-r--r-- | src/corelib/thread/qthread_p.h | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/src/corelib/thread/qthread_p.h b/src/corelib/thread/qthread_p.h index c57500553b..0735746b9f 100644 --- a/src/corelib/thread/qthread_p.h +++ b/src/corelib/thread/qthread_p.h @@ -211,6 +211,21 @@ public: # endif }; +// thread wrapper for the main() thread +class QAdoptedThread : public QThread +{ + Q_DECLARE_PRIVATE(QThread) + +public: + QAdoptedThread(QThreadData *data = 0); + ~QAdoptedThread(); + void init(); + + static QThread *createThreadForAdoption(); +private: + void run(); +}; + QT_END_NAMESPACE #endif // QTHREAD_P_H |