From: Rafaël Carré <funman@videolan.org>
Date: Sat, 8 Mar 2008 12:49:54 +0000 (+0100)
Subject: thanks for Trolltech fixing their mess, after a bug request that using valgrind cause... 
X-Git-Tag: 0.9.0-test0~2255
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=d8fc5a1ddb75eb9d53fc090ad1e5e8bfe2522bb0;p=vlc

thanks for Trolltech fixing their mess, after a bug request that using valgrind caused the same kind of problem.
---

diff --git a/modules/gui/qt4/qt4.cpp b/modules/gui/qt4/qt4.cpp
index fa2b2792ea..26e1e04c2f 100644
--- a/modules/gui/qt4/qt4.cpp
+++ b/modules/gui/qt4/qt4.cpp
@@ -287,8 +287,8 @@ static void Init( intf_thread_t *p_intf )
 
     Q_INIT_RESOURCE( vlc );
 
-#if !defined(WIN32) && !defined(__APPLE__)
-    /* KLUDGE:
+#if !defined(WIN32) && !defined(__APPLE__) && QT_VERSION < 0x040400
+    /* KLUDGE for QT4 < 4.4.0 (which use libgconf to avoid that)
      * disables icon theme use because that makes Cleanlooks style bug
      * because it asks gconf for some settings that timeout because of threads
      * see commits 21610 21622 21654 for reference */