Ticket #4853: mythtv-4853-StyleSetting_default.2.patch

programs/mythfrontend/globalsettings.cpp

@@ -2985 +2985 @@
 
     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/libmythui/mythuihelper.cpp

@@ -10 +10 @@
 #include <QApplication>
 #include <QPainter>
 #include <QDesktopWidget>
+#include <QStyleFactory>
 
 #include "mythdirs.h"
 #include "mythuihelper.h"
@@ -389 +390 @@
 
     d->m_qtThemeSettings = new Settings;
 
-    QString style = GetMythDB()->GetSetting("Style", "");
-    if (!style.isEmpty())
+    QString style = GetMythDB()->GetSetting("Style",
+                                            "UseSystemDefaultDesktopStyle");
+    if (QStyleFactory::keys().contains(style))
         qApp->setStyle(style);
 
     QString themename = GetMythDB()->GetSetting("Theme");