[vlc-devel] commit: thanks for Trolltech fixing their mess, after a bug request that using valgrind caused the same kind of problem. ( Rafaël Carré )

[git version control]

vlc | branch: master | Rafaël Carré <funman at videolan.org> | Sat Mar  8 13:49:54 2008 +0100| [d8fc5a1ddb75eb9d53fc090ad1e5e8bfe2522bb0]

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

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=d8fc5a1ddb75eb9d53fc090ad1e5e8bfe2522bb0
---

 modules/gui/qt4/qt4.cpp |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/gui/qt4/qt4.cpp b/modules/gui/qt4/qt4.cpp
index fa2b279..26e1e04 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 */