From 570ae40f57f048d53ed32d035804746a11489f48 Mon Sep 17 00:00:00 2001
From: Jens Bache-Wiig <jens.bache-wiig@digia.com>
Date: Tue, 18 Sep 2012 13:55:45 +0200
Subject: Remove CDE and Motif styles from qtbase

It is time to clean up some of our legacy code. These styles have
not been actively maintained for a long time and I think it is safe
to say that they should no longer belong as part of the default
distribution of Qt. We dont support any platforms based on CDE with
our source packages.

Note that even if we are removing these styles from the default
distribution of Qt, applications that depend on them
will still be able to bundle the existing (and unmodified) styles
along with their own source code as we are not breaking compatibility.

Change-Id: I1709630c20ba8e8088cd01628628d86856db57a4
Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
---
 tests/auto/widgets/styles/qstyle/tst_qstyle.cpp    | 33 ----------------------
 .../qstylesheetstyle/tst_qstylesheetstyle.cpp      |  3 +-
 2 files changed, 2 insertions(+), 34 deletions(-)

(limited to 'tests/auto/widgets/styles')

diff --git a/tests/auto/widgets/styles/qstyle/tst_qstyle.cpp b/tests/auto/widgets/styles/qstyle/tst_qstyle.cpp
index e20891adc4..6bbcc4d1c1 100644
--- a/tests/auto/widgets/styles/qstyle/tst_qstyle.cpp
+++ b/tests/auto/widgets/styles/qstyle/tst_qstyle.cpp
@@ -57,8 +57,6 @@
 
 #include <qplastiquestyle.h>
 #include <qwindowsstyle.h>
-#include <qcdestyle.h>
-#include <qmotifstyle.h>
 #include <qcommonstyle.h>
 #include <qproxystyle.h>
 #include <qstylefactory.h>
@@ -121,16 +119,10 @@ private slots:
     void cleanupTestCase();
     void init();
     void cleanup();
-#ifndef QT_NO_STYLE_MOTIF
-    void testMotifStyle();
-#endif
 #ifndef QT_NO_STYLE_PLASTIQUE
     void testPlastiqueStyle();
 #endif
     void testWindowsStyle();
-#ifndef QT_NO_STYLE_CDE
-    void testCDEStyle();
-#endif
 #ifndef QT_NO_STYLE_WINDOWSXP
     void testWindowsXPStyle();
 #endif
@@ -195,24 +187,15 @@ void tst_QStyle::cleanupTestCase()
 void tst_QStyle::testStyleFactory()
 {
     QStringList keys = QStyleFactory::keys();
-#ifndef QT_NO_STYLE_MOTIF
-    QVERIFY(keys.contains("Motif"));
-#endif
 #ifndef QT_NO_STYLE_CLEANLOOKS
     QVERIFY(keys.contains("Cleanlooks"));
 #endif
 #ifndef QT_NO_STYLE_PLASTIQUE
     QVERIFY(keys.contains("Plastique"));
 #endif
-#ifndef QT_NO_STYLE_CDE
-    QVERIFY(keys.contains("CDE"));
-#endif
 #ifndef QT_NO_STYLE_WINDOWS
     QVERIFY(keys.contains("Windows"));
 #endif
-#ifndef QT_NO_STYLE_MOTIF
-    QVERIFY(keys.contains("Motif"));
-#endif
 #ifdef Q_OS_WIN
     if (QSysInfo::WindowsVersion >= QSysInfo::WV_XP &&
         (QSysInfo::WindowsVersion & QSysInfo::WV_NT_based))
@@ -569,22 +552,6 @@ void tst_QStyle::testMacStyle()
 #endif
 }
 
-#ifndef QT_NO_STYLE_MOTIF
-void tst_QStyle::testMotifStyle()
-{
-    QMotifStyle mstyle;
-    QVERIFY(testAllFunctions(&mstyle));
-}
-#endif
-
-#ifndef QT_NO_STYLE_CDE
-void tst_QStyle::testCDEStyle()
-{
-    QCDEStyle cstyle;
-    QVERIFY(testAllFunctions(&cstyle));
-}
-#endif
-
 void tst_QStyle::testWindowsCEStyle()
 {
 #if defined(Q_OS_WINCE)
diff --git a/tests/auto/widgets/styles/qstylesheetstyle/tst_qstylesheetstyle.cpp b/tests/auto/widgets/styles/qstylesheetstyle/tst_qstylesheetstyle.cpp
index 796b40573d..310e43cd53 100644
--- a/tests/auto/widgets/styles/qstylesheetstyle/tst_qstylesheetstyle.cpp
+++ b/tests/auto/widgets/styles/qstylesheetstyle/tst_qstylesheetstyle.cpp
@@ -44,6 +44,7 @@
 #include <QtTest/QtTest>
 #include <QtDebug>
 #include <QMetaObject>
+#include <QPlastiqueStyle>
 
 #include <private/qstylesheetstyle_p.h>
 #include "../../../platformquirks.h"
@@ -1590,7 +1591,7 @@ class ChangeEventWidget : public QWidget
             static bool recurse = false;
             if (!recurse) {
                 recurse = true;
-                QStyle *style = new QMotifStyle;
+                QStyle *style = new QPlastiqueStyle;
                 style->setParent(this);
                 setStyle(style);
                 recurse = false;
-- 
cgit v1.2.3