diff options
| author | Timothy Pearson <[email protected]> | 2013-05-14 19:34:10 -0500 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2013-05-14 19:34:10 -0500 |
| commit | 4eba9b823832a5bab1acffeabc245b06fe113d75 (patch) | |
| tree | 9ec81ead726a66066c6450c805beb8e233391a65 /src/kernel/qapplication.h | |
| parent | be8413249bb8a6d8dc2cfc693d9c1037284fd251 (diff) | |
| download | qt3-4eba9b823832a5bab1acffeabc245b06fe113d75.tar.gz qt3-4eba9b823832a5bab1acffeabc245b06fe113d75.zip | |
Fix a number of threading data races
Add proper thread termination handler
This partially resolves Bug 1508
Diffstat (limited to 'src/kernel/qapplication.h')
| -rw-r--r-- | src/kernel/qapplication.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/kernel/qapplication.h b/src/kernel/qapplication.h index 5611164..f05dbc3 100644 --- a/src/kernel/qapplication.h +++ b/src/kernel/qapplication.h @@ -352,11 +352,12 @@ private slots: void postIMEvent( QObject *receiver, QIMEvent *event ); #endif -private: +public: #ifdef QT_THREAD_SUPPORT static QMutex *qt_mutex; #endif // QT_THREAD_SUPPORT +private: int app_argc; char **app_argv; bool quit_now; @@ -434,6 +435,7 @@ private: friend class QDialog; friend class QAccelManager; friend class QEvent; + friend class QThread; friend class QTranslator; friend class QEventLoop; friend Q_EXPORT void qt_ucm_initialize( QApplication * ); @@ -457,6 +459,7 @@ public: static QThread* guiThread(); #endif static bool isGuiThread(); + static void threadTerminationHandler( QThread * ); }; inline int QApplication::argc() const |