Ticket #4853: mythtv-4853-StyleSetting_default.patch

programs/mythfrontend/globalsettings.cpp

@@ -2860 +2860 @@
 
     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

@@ -7 +7 @@
 #include <qfileinfo.h>
 #include <qdesktopwidget.h>
 #include <qpainter.h>
+#include <QStyleFactory>
 
 #include <cmath>
 #include <queue>
@@ -2018 +2019 @@
 
     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");