From: Rafaël Carré <funman@videolan.org>
Date: Wed, 5 Sep 2007 16:09:19 +0000 (+0000)
Subject: Fix use of qcleanlooks style
X-Git-Tag: 0.9.0-test0~5853
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=e677bda82afc3a4cc609b590e9ee7e30150cebb9;p=vlc

Fix use of qcleanlooks style
---

diff --git a/modules/gui/qt4/qt4.cpp b/modules/gui/qt4/qt4.cpp
index 90dc23416d..a1c8591970 100644
--- a/modules/gui/qt4/qt4.cpp
+++ b/modules/gui/qt4/qt4.cpp
@@ -209,17 +209,16 @@ static void Init( intf_thread_t *p_intf )
     int argc = 1;
 
     Q_INIT_RESOURCE( vlc );
+#ifndef WIN32
+    /* KLUDGE:
+     * disables icon theme use because that makes cleanlook style bug
+     * see commits 21610 21622 21654 for reference */
+    QApplication::setDesktopSettingsAware(false);
+#endif
     QApplication *app = new QApplication( argc, argv , true );
     app->setWindowIcon( QIcon( QPixmap(vlc_xpm) ) );
     p_intf->p_sys->p_app = app;
 
-#ifndef WIN32
-    /* kludge:
-     * forces plastique style as cleanlooks bugs on gnome */
-    QPlastiqueStyle *plastique = new QPlastiqueStyle;
-    app->setStyle( plastique );
-#endif
-
     // Initialize timers
     DialogsProvider::getInstance( p_intf );