From 105513a888436ad98e0d85155ea3c09f59a83411 Mon Sep 17 00:00:00 2001 From: Gunnar Sletta Date: Thu, 19 May 2011 08:34:52 +0200 Subject: [PATCH] Always call XInitThreads. Any Qt application that embeds a QSGView needs to call this because of the threaded renderer. Today applications that use threaded GL silently fail. In a few weeks time, the refactor branch will be merged, which will obsolete this change, so it is a temporary measure to get tests and examples running. --- src/gui/kernel/qapplication_x11.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/gui/kernel/qapplication_x11.cpp b/src/gui/kernel/qapplication_x11.cpp index 20542ea..d1f9eb1 100644 --- a/src/gui/kernel/qapplication_x11.cpp +++ b/src/gui/kernel/qapplication_x11.cpp @@ -1740,8 +1740,8 @@ void qt_init(QApplicationPrivate *priv, int, } else { // Qt controls everything (default) - if (QApplication::testAttribute(Qt::AA_X11InitThreads)) - XInitThreads(); + // With the threaded QML renderer, we always need this. + XInitThreads(); // Set application name and class char *app_class = 0; -- 2.7.4