Remove dependencies on Plastique and Cleanlooks

We want to move these styles out of the library so
we should not depend on them in creator.

This patch reverts 63cacc4534,
since it does not rely on ifdefs.

See also 5d0f7d2304 in master.

Change-Id: I8a3762f9bc31c679067ebb0a6b5540bc18e8b836
Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>

src/plugins/coreplugin/mainwindow.cpp

@@ -188,12 +188,16 @@ MainWindow::MainWindow() :
 #if defined(Q_OS_UNIX) && !defined(Q_OS_MAC)
     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
+        if (QStyleFactory::keys().contains("Fusion"))
-        QByteArray desktopEnvironment = qgetenv("DESKTOP_SESSION");
+            baseName = QLatin1String("fusion"); // Qt5
-        if (desktopEnvironment == "kde")
+        else { // Qt4
-            baseName = QLatin1String("plastique");
+            // e.g. if we are running on a KDE4 desktop
-        else
+            QByteArray desktopEnvironment = qgetenv("DESKTOP_SESSION");
-            baseName = QLatin1String("cleanlooks");
+            if (desktopEnvironment == "kde")
+                baseName = QLatin1String("plastique");
+            else
+                baseName = QLatin1String("cleanlooks");
+        }
     }
 #endif
     qApp->setStyle(new ManhattanStyle(baseName));

src/plugins/qmldesigner/components/propertyeditor/basicwidgets.cpp

@@ -44,53 +44,43 @@
 #include <QDebug>
 #include <QApplication>
 #include <QGraphicsOpacityEffect>
-#if QT_VERSION >= 0x050000
+#include <QWindowsStyle>
-#  include <QFusionStyle>
+
-#else
-#  include <QCleanlooksStyle>
-#  include <QPlastiqueStyle>
-#endif
 #include <QTextEdit>
 
 
 QT_BEGIN_NAMESPACE
 
-class CleanLooksSingleton
+class WindowsStyleSingleton
 {
    public:
-     static CleanLooksSingleton* instance();
+     static WindowsStyleSingleton* instance();
      QStyle* style() {return &m_style; };
 
    private:
-     static CleanLooksSingleton *m_instance;
+     static WindowsStyleSingleton *m_instance;
 
-#if QT_VERSION >= 0x050000
+     QWindowsStyle m_style;
-     QFusionStyle m_style;
-#elif defined(Q_OS_MAC)
-     QPlastiqueStyle m_style;
-#else
-     QCleanlooksStyle m_style;
-#endif
 
-     CleanLooksSingleton() {}
+     WindowsStyleSingleton() {}
-     CleanLooksSingleton( const CleanLooksSingleton& );
+     WindowsStyleSingleton( const WindowsStyleSingleton& );
 
-     class CleanLooksWatcher {
+     class WindowsWatcher {
-         public: ~CleanLooksWatcher() {
+         public: ~WindowsWatcher() {
-           if( CleanLooksSingleton::m_instance != 0 )
+           if ( WindowsStyleSingleton::m_instance != 0 )
-             delete CleanLooksSingleton::m_instance;
+             delete WindowsStyleSingleton::m_instance;
          }
      };
-     friend class CleanLooksWatcher;
+     friend class WindowsWatcher;
 };
 
-CleanLooksSingleton* CleanLooksSingleton::m_instance = 0;
+WindowsStyleSingleton* WindowsStyleSingleton::m_instance = 0;
 
-CleanLooksSingleton* CleanLooksSingleton::instance()
+WindowsStyleSingleton* WindowsStyleSingleton::instance()
 {
-  static CleanLooksWatcher w;
+  static WindowsWatcher w;
   if( m_instance == 0 )
-    m_instance = new CleanLooksSingleton();
+    m_instance = new WindowsStyleSingleton();
   return m_instance;
 }
 
@@ -175,7 +165,7 @@ public:
         filter->setDuiTarget(this);
         m_mouseOver = false;
         q->installEventFilter(filter);
-        q->setStyle(CleanLooksSingleton::instance()->style());
+        q->setStyle(WindowsStyleSingleton::instance()->style());
         Q_ASSERT(q);
     }
     virtual ~QWidgetDeclarativeUI() {