thanks for Trolltech fixing their mess, after a bug request that using valgrind cause...
authorRafaël Carré <funman@videolan.org>
Sat, 8 Mar 2008 12:49:54 +0000 (13:49 +0100)
committerRafaël Carré <funman@videolan.org>
Sat, 8 Mar 2008 12:50:52 +0000 (13:50 +0100)
modules/gui/qt4/qt4.cpp

index fa2b279..26e1e04 100644 (file)
@@ -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 */