2 files changed, 2 insertions, 34 deletions
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;