diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2012-01-23 14:09:52 -0600 |
|---|---|---|
| committer | Slávek Banko <slavek.banko@axis.cz> | 2012-06-02 20:29:54 +0200 |
| commit | 8f2ce2b619e03579c1ce44a5087692bd6780b537 (patch) | |
| tree | 80c1dd16a981b61868e3a4f4e3f3cd628f5fa1b2 | |
| parent | 95715b32b09ef966d3e6a49ee889c1e6a554feb9 (diff) | |
| download | qt3-8f2ce2b619e03579c1ce44a5087692bd6780b537.tar.gz qt3-8f2ce2b619e03579c1ce44a5087692bd6780b537.zip | |
Initialize X11 threading when Qt threading is enabled
This closes Bug 812
(cherry picked from commit 1f3965029290616c894f2d5e668ddfbd5795d6a0)
| -rw-r--r-- | src/kernel/qapplication_x11.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/kernel/qapplication_x11.cpp b/src/kernel/qapplication_x11.cpp index e72bd63..f8dd445 100644 --- a/src/kernel/qapplication_x11.cpp +++ b/src/kernel/qapplication_x11.cpp @@ -1632,6 +1632,12 @@ void qt_init_internal( int *argcptr, char **argv, setlocale( LC_ALL, "" ); // use correct char set mapping setlocale( LC_NUMERIC, "C" ); // make sprintf()/scanf() work +#if defined(QT_THREAD_SUPPORT) + if ( qt_is_gui_used ) { + XInitThreads(); + } +#endif + if ( display ) { // Qt part of other application |