Qt4: remove the old Maemo 5 systray hack

diff --git a/modules/gui/qt4/dialogs/firstrun.cpp b/modules/gui/qt4/dialogs/firstrun.cpp
index ace65cf0f31a74a0845a01a2194700097531abf2..a24ba621724a3ffad56212ca66c9a84a6f5e114e 100644 (file)
--- a/modules/gui/qt4/dialogs/firstrun.cpp
+++ b/modules/gui/qt4/dialogs/firstrun.cpp
@@ -32,11 +32,9 @@
 FirstRun::FirstRun( QWidget *_p, intf_thread_t *_p_intf  )
          : QWidget( _p ), p_intf( _p_intf )
 {
-#ifndef HAVE_MAEMO
     msg_Dbg( p_intf, "Boring first Run Wizard" );
     buildPrivDialog();
     setVisible( true );
-#endif
 }
 
 #define ALBUM_ART_WHEN_ASKED 0

diff --git a/modules/gui/qt4/qt4.cpp b/modules/gui/qt4/qt4.cpp
index 7adb1c5046b09a5461d2f09a5bf06aee3c183f67..13511079d237b951903b44ae9326bc8493050cd7 100644 (file)
--- a/modules/gui/qt4/qt4.cpp
+++ b/modules/gui/qt4/qt4.cpp
@@ -201,13 +201,7 @@ vlc_module_begin ()
     add_bool( "qt-minimal-view", false, QT_MINIMAL_MODE_TEXT,
               QT_MINIMAL_MODE_TEXT, false );
 
-    add_bool( "qt-system-tray",
-#ifdef HAVE_MAEMO
-            false,
-#else
-            true,
-#endif
-            SYSTRAY_TEXT, SYSTRAY_LONGTEXT, false)
+    add_bool( "qt-system-tray", true, SYSTRAY_TEXT, SYSTRAY_LONGTEXT, false)
 
     add_integer( "qt-notification", NOTIFICATION_MINIMIZED,
                  NOTIFICATION_TEXT,