[vlc-devel] commit: Remove kludge for old Qt versions. (Jean-Baptiste Kempf )

[git version control]

vlc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Thu May 14 19:36:44 2009 +0200| [f8df68c86b26c03bbd8a0dea7240b46351abc990] | committer: Jean-Baptiste Kempf 

Remove kludge for old Qt versions.

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

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

diff --git a/modules/gui/qt4/qt4.cpp b/modules/gui/qt4/qt4.cpp
index 7455ac0..61c1276 100644
--- a/modules/gui/qt4/qt4.cpp
+++ b/modules/gui/qt4/qt4.cpp
@@ -350,17 +350,6 @@ static void *Thread( void *obj )
 
     Q_INIT_RESOURCE( vlc );
 
-#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 */
-
-    /* If you don't have a gconftool-2 binary, you should comment this line */
-    if( strcmp( qVersion(), "4.4.0" ) < 0 ) /* fixed in Qt 4.4.0 */
-        QApplication::setDesktopSettingsAware( false );
-#endif
-
     /* Start the QApplication here */
 #ifdef Q_WS_X11
     char *display = var_CreateGetNonEmptyString( p_intf, "x11-display" );