From ee61e050560dec84278eed6a1dcb3120e6eddddc Mon Sep 17 00:00:00 2001 From: =?utf8?q?Rafa=C3=ABl=20Carr=C3=A9?= Date: Sat, 8 Mar 2008 13:53:08 +0100 Subject: [PATCH] We want to check QT4 version at runtime rather than buildtime Revert "thanks for Trolltech fixing their mess, after a bug request that using valgrind caused the same kind of problem." This reverts commit d8fc5a1ddb75eb9d53fc090ad1e5e8bfe2522bb0. --- modules/gui/qt4/qt4.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/gui/qt4/qt4.cpp b/modules/gui/qt4/qt4.cpp index 26e1e04c2f..fa2b2792ea 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__) && QT_VERSION < 0x040400 - /* KLUDGE for QT4 < 4.4.0 (which use libgconf to avoid that) +#if !defined(WIN32) && !defined(__APPLE__) + /* KLUDGE: * 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 */ -- 2.39.5