summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2012-03-10 15:52:22 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2012-03-10 15:52:22 -0600
commitf3c5f3ba06eb7394303c6500094f6d1f58d4092a (patch)
treebce7b6dbc15550bd7b9fe505ec2e514caa853177
parenteb1d1e0dec5720ace27395e290b7093cd68b150d (diff)
downloadtqt3-f3c5f3ba06eb7394303c6500094f6d1f58d4092a.tar.gz
tqt3-f3c5f3ba06eb7394303c6500094f6d1f58d4092a.zip
Automated update from Qt3
-rw-r--r--src/kernel/qapplication_x11.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/kernel/qapplication_x11.cpp b/src/kernel/qapplication_x11.cpp
index 874afe060..0dbd6ce78 100644
--- a/src/kernel/qapplication_x11.cpp
+++ b/src/kernel/qapplication_x11.cpp
@@ -1646,7 +1646,8 @@ void tqt_init_internal( int *argcptr, char **argv,
setlocale( LC_NUMERIC, "C" ); // make sprintf()/scanf() work
#if defined(QT_THREAD_SUPPORT)
- if ( tqt_is_gui_used ) {
+ if (( tqt_is_gui_used ) && ( !display )) {
+ // If TQt is running standalone with a GUI, initialize X11 threading
XInitThreads();
}
#endif