From 9b50c26e8fdfaff7784ccea3e19a83f5f3725207 Mon Sep 17 00:00:00 2001
From: Fredrik Arvidsson <fredrik@arvidssons.org>
Date: Tue, 28 Jan 2014 19:42:20 +0100
Subject: [PATCH] OP-1088 Switched to use 'Fusion' style on the application

---
 .../src/plugins/coreplugin/mainwindow.cpp     | 19 ++++---------------
 1 file changed, 4 insertions(+), 15 deletions(-)

diff --git a/ground/openpilotgcs/src/plugins/coreplugin/mainwindow.cpp b/ground/openpilotgcs/src/plugins/coreplugin/mainwindow.cpp
index f2886eebf..197058f29 100644
--- a/ground/openpilotgcs/src/plugins/coreplugin/mainwindow.cpp
+++ b/ground/openpilotgcs/src/plugins/coreplugin/mainwindow.cpp
@@ -50,7 +50,9 @@
 #include "ioutputpane.h"
 #include "icorelistener.h"
 #include "iconfigurableplugin.h"
-#include "manhattanstyle.h"
+
+#include <qstylefactory.h>
+
 #include "rightpane.h"
 #include "settingsdialog.h"
 #include "threadmanager.h"
@@ -140,20 +142,7 @@ MainWindow::MainWindow() :
     QCoreApplication::setOrganizationName(QLatin1String("OpenPilot"));
     QCoreApplication::setOrganizationDomain(QLatin1String("openpilot.org"));
     QSettings::setDefaultFormat(XmlConfig::XmlSettingsFormat);
-    QString baseName = qApp->style()->objectName();
-#ifdef Q_WS_X11
-    if (baseName == QLatin1String("windows")) {
-        // Sometimes we get the standard windows 95 style as a fallback
-        // e.g. if we are running on a KDE4 desktop
-        QByteArray desktopEnvironment = qgetenv("DESKTOP_SESSION");
-        if (desktopEnvironment == "kde") {
-            baseName = QLatin1String("plastique");
-        } else {
-            baseName = QLatin1String("cleanlooks");
-        }
-    }
-#endif
-    qApp->setStyle(new ManhattanStyle(baseName));
+    qApp->setStyle(QStyleFactory::create("Fusion"));
 
     setDockNestingEnabled(true);