Remove Cleanlooks and Plastique

We have a new style Fusion that will replace these styles.
They will be moved to a separate
module rather than included in platforms that do not need them.

Change-Id: I51ebbcad5406e99130e5b12e62ba624d1489088c
Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>

1 files changed, 12 insertions, 44 deletions

diff --git a/src/widgets/styles/styles.pri b/src/widgets/styles/styles.pri
index 1aae0d89f3..9c5a790390 100644
--- a/src/widgets/styles/styles.pri
+++ b/src/widgets/styles/styles.pri
@@ -37,7 +37,7 @@ wince* {
 }
 
 contains( styles, all ) {
-    styles = mac windows windowsxp windowsvista
+    styles = fusion mac windows windowsxp windowsvista
 }
 
 !macx-*|ios:styles -= mac
@@ -65,6 +65,14 @@ contains( styles, mac ) {
     DEFINES += QT_NO_STYLE_MAC
 }
 
+contains( styles, windows ) {
+    HEADERS += styles/qwindowsstyle.h
+    SOURCES += styles/qwindowsstyle.cpp
+    DEFINES += QT_STYLE_WINDOWS
+} else {
+    DEFINES += QT_NO_STYLE_WINDOWS
+}
+
 contains( styles, windowsvista ) {
     HEADERS += styles/qwindowsvistastyle.h
     HEADERS += styles/qwindowsvistastyle_p.h
@@ -72,7 +80,7 @@ contains( styles, windowsvista ) {
     !contains( styles, windowsxp ) {
         message( windowsvista requires windowsxp )
         styles += windowsxp
-        DEFINES+= QT_STYLE_WINDOWSXP
+        DEFINES += QT_STYLE_WINDOWSXP
     }
 } else {
     DEFINES += QT_NO_STYLE_WINDOWSVISTA
@@ -83,25 +91,13 @@ contains( styles, windowsxp ) {
     SOURCES += styles/qwindowsxpstyle.cpp
     !contains( styles, windows ) {
         message( windowsxp requires windows )
-        styles += windows
-        DEFINES+= QT_STYLE_WINDOWS
+        styles  += windows
+        DEFINES += QT_STYLE_WINDOWS
     }
 } else {
     DEFINES += QT_NO_STYLE_WINDOWSXP
 }
 
-contains( styles, plastique ) {
-    HEADERS += styles/qplastiquestyle.h
-    SOURCES += styles/qplastiquestyle.cpp
-    !contains( styles, windows ) {
-        message( plastique requires windows )
-        styles += windows
-        DEFINES+= QT_STYLE_WINDOWS
-    }
-} else {
-    DEFINES += QT_NO_STYLE_PLASTIQUE
-}
-
 contains( styles, gtk ) {
         HEADERS += styles/qgtkstyle.h
         HEADERS += styles/qgtkpainter_p.h
@@ -109,45 +105,17 @@ contains( styles, gtk ) {
         SOURCES += styles/qgtkstyle.cpp
         SOURCES += styles/qgtkpainter.cpp
         SOURCES += styles/qgtkstyle_p.cpp
-    !contains( styles, cleanlooks ) {
-        styles += cleanlooks
-        DEFINES+= QT_STYLE_CLEANLOOKS
-    }
 } else {
     DEFINES += QT_NO_STYLE_GTK
 }
-
-contains( styles, cleanlooks ) {
-        HEADERS += styles/qcleanlooksstyle.h
-        HEADERS += styles/qcleanlooksstyle_p.h
-        SOURCES += styles/qcleanlooksstyle.cpp
-    !contains( styles, windows ) {
-        styles += windows
-        DEFINES+= QT_STYLE_WINDOWS
-    }
-} else {
-    DEFINES += QT_NO_STYLE_CLEANLOOKS
-}
-
 contains( styles, fusion ) {
         HEADERS += styles/qfusionstyle.h
         HEADERS += styles/qfusionstyle_p.h
         SOURCES += styles/qfusionstyle.cpp
-    !contains( styles, windows ) {
-        styles += windows
-        DEFINES+= QT_STYLE_WINDOWS
-    }
 } else {
     DEFINES += QT_NO_STYLE_FUSION
 }
 
-contains( styles, windows ) {
-    HEADERS += styles/qwindowsstyle.h
-    SOURCES += styles/qwindowsstyle.cpp
-} else {
-    DEFINES += QT_NO_STYLE_WINDOWS
-}
-
 contains( styles, windowsce ) {
     HEADERS += styles/qwindowscestyle.h
     SOURCES += styles/qwindowscestyle.cpp