summaryrefslogtreecommitdiffstats
path: root/src/kernel
diff options
context:
space:
mode:
authorTimothy Pearson <[email protected]>2012-01-23 14:09:52 -0600
committerTimothy Pearson <[email protected]>2012-01-23 14:09:52 -0600
commit1f3965029290616c894f2d5e668ddfbd5795d6a0 (patch)
treee2d1f8fedb8c533fd6e973976f4f823a858e434f /src/kernel
parentc8ceccf367865d9e377db630b8e4a1530e9c2c39 (diff)
downloadqt3-1f3965029290616c894f2d5e668ddfbd5795d6a0.tar.gz
qt3-1f3965029290616c894f2d5e668ddfbd5795d6a0.zip
Initialize X11 threading when Qt threading is enabled
This closes Bug 812
Diffstat (limited to 'src/kernel')
-rw-r--r--src/kernel/qapplication_x11.cpp6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/kernel/qapplication_x11.cpp b/src/kernel/qapplication_x11.cpp
index 4553fdf..7bc9f48 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