Ticket #4853: mythtv-StyleSetting_default.patch

programs/mythfrontend/globalsettings.cpp

@@ -2843 +2843 @@
 
     void fillSelections(void) {
         clearSelections();
-        addSelection(QObject::tr("Desktop Style"), "");
+        addSelection(QObject::tr("Desktop Style"),
+                     "UseSystemDefaultDesktopStyle");
         QStyleFactory factory;
         QStringList list = factory.keys();
         QStringList::iterator iter = list.begin();

libs/libmyth/mythcontext.cpp

@@ -10 +10 @@
 #include <qnetwork.h>
 #include <qwaitcondition.h>
 #include <qregexp.h>
+#include <qstylefactory.h>
 
 #include <qhostaddress.h>
 
@@ -1994 +1995 @@
 
     d->m_qtThemeSettings = new Settings;
 
-    QString style = GetSetting("Style", "");
-    if (style != "")
+    QString style = GetSetting("Style", "UseSystemDefaultDesktopStyle");
+    if (QStyleFactory::keys().contains(style))
         qApp->setStyle(style);
 
     QString themename = GetSetting("Theme");