[Libreoffice-commits] .: vcl/unx

[Lubos Lunak]

 vcl/unx/kde4/main.cxx |   11 +++++++++++
 1 file changed, 11 insertions(+)

New commits:
commit 6163c62a52794725188faf82ee12852f4b2cd023
Author: Luboš Luňák <l.lunak at suse.cz>
Date:   Thu Oct 20 16:41:50 2011 +0200

    let Qt call XInitThreads(), so that it knows it's been called (fdo#40298)
    
    Otherwise QPixmap complains when used outside of the main Qt thread
    and resets itself to null pixmap, eventually leading to crashes.

diff --git a/vcl/unx/kde4/main.cxx b/vcl/unx/kde4/main.cxx
index 9e0a361..482a212 100644
--- a/vcl/unx/kde4/main.cxx
+++ b/vcl/unx/kde4/main.cxx
@@ -56,7 +56,18 @@ extern "C" {
            established, so protect X against itself
         */
         if( ! ( pNoXInitThreads && *pNoXInitThreads ) )
+        {
+#if QT_VERSION >= 0x040800
+            // let Qt call XInitThreads(), so that also Qt knows it's been used
+            // (otherwise QPixmap may warn about threads not being initialized)
+            QApplication::setAttribute( Qt::AA_X11InitThreads );
+#else
             XInitThreads();
+            // just in case somebody builds with old version and then upgrades Qt,
+            // otherwise this is a no-op
+            QApplication::setAttribute( static_cast< ApplicationAttribute >( 10 ));
+#endif
+        }
 
 #if QT_VERSION < 0x050000
         // Qt 4.x support needs >= 4.1.0