diff options
author | Jens Bache-Wiig <jens.bache-wiig@digia.com> | 2012-10-18 15:22:15 +0200 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-10-22 19:36:43 +0200 |
commit | 087e4bc5171f0ced1f34663e59217d678cd350ba (patch) | |
tree | 0d122365bbc8bd4147196a1b379e0f7e57d3eb8e /tests/auto/widgets/styles/qstyle | |
parent | a0e5d6c1c05f1d9f811eaf2760193618ae8a83ca (diff) |
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>
Diffstat (limited to 'tests/auto/widgets/styles/qstyle')
-rw-r--r-- | tests/auto/widgets/styles/qstyle/tst_qstyle.cpp | 46 |
1 files changed, 16 insertions, 30 deletions
diff --git a/tests/auto/widgets/styles/qstyle/tst_qstyle.cpp b/tests/auto/widgets/styles/qstyle/tst_qstyle.cpp index 6bbcc4d1c1..1bb87b1f32 100644 --- a/tests/auto/widgets/styles/qstyle/tst_qstyle.cpp +++ b/tests/auto/widgets/styles/qstyle/tst_qstyle.cpp @@ -55,7 +55,6 @@ #include <qtoolbutton.h> #include <qtoolbar.h> -#include <qplastiquestyle.h> #include <qwindowsstyle.h> #include <qcommonstyle.h> #include <qproxystyle.h> @@ -72,7 +71,9 @@ #include <qmdiarea.h> #include <qscrollarea.h> -#include <QCleanlooksStyle> +#ifndef Q_NO_STYLE_FUSION +#include <qfusionstyle.h> +#endif #ifdef Q_OS_MAC #include <QMacStyle> @@ -116,27 +117,24 @@ private: private slots: void drawItemPixmap(); void initTestCase(); + void cleanup(); void cleanupTestCase(); void init(); - void cleanup(); -#ifndef QT_NO_STYLE_PLASTIQUE - void testPlastiqueStyle(); +#ifndef QT_NO_STYLE_FUSION + void testFusionStyle(); #endif void testWindowsStyle(); #ifndef QT_NO_STYLE_WINDOWSXP void testWindowsXPStyle(); #endif void testWindowsVistaStyle(); -#ifndef QT_NO_STYLE_CLEANLOOKS - void testCleanlooksStyle(); -#endif void testMacStyle(); void testWindowsCEStyle(); void testWindowsMobileStyle(); void testStyleFactory(); void testProxyStyle(); void pixelMetric(); -#if !defined(QT_NO_STYLE_PLASTIQUE) && !defined(QT_NO_STYLE_WINDOWS) +#if !defined(QT_NO_STYLE_WINDOWS) void progressBarChangeStyle(); #endif void defaultFont(); @@ -187,11 +185,8 @@ void tst_QStyle::cleanupTestCase() void tst_QStyle::testStyleFactory() { QStringList keys = QStyleFactory::keys(); -#ifndef QT_NO_STYLE_CLEANLOOKS - QVERIFY(keys.contains("Cleanlooks")); -#endif -#ifndef QT_NO_STYLE_PLASTIQUE - QVERIFY(keys.contains("Plastique")); +#ifndef QT_NO_STYLE_FUSION + QVERIFY(keys.contains("Fusion")); #endif #ifndef QT_NO_STYLE_WINDOWS QVERIFY(keys.contains("Windows")); @@ -366,21 +361,12 @@ bool tst_QStyle::testScrollBarSubControls(QStyle* style) return true; } -#ifndef QT_NO_STYLE_PLASTIQUE -void tst_QStyle::testPlastiqueStyle() +#ifndef QT_NO_STYLE_FUSION +void tst_QStyle::testFusionStyle() { - QPlastiqueStyle pstyle; - QVERIFY(testAllFunctions(&pstyle)); - lineUpLayoutTest(&pstyle); -} -#endif - -#ifndef QT_NO_STYLE_CLEANLOOKS -void tst_QStyle::testCleanlooksStyle() -{ - QCleanlooksStyle cstyle; - QVERIFY(testAllFunctions(&cstyle)); - lineUpLayoutTest(&cstyle); + QFusionStyle fstyle; + QVERIFY(testAllFunctions(&fstyle)); + lineUpLayoutTest(&fstyle); } #endif @@ -653,14 +639,14 @@ void tst_QStyle::pixelMetric() delete style; } -#if !defined(QT_NO_STYLE_PLASTIQUE) && !defined(QT_NO_STYLE_WINDOWS) +#if !defined(QT_NO_STYLE_WINDOWS) void tst_QStyle::progressBarChangeStyle() { //test a crashing situation (task 143530) //where changing the styles and deleting a progressbar would crash QWindowsStyle style1; - QPlastiqueStyle style2; + QFusionStyle style2; QProgressBar *progress=new QProgressBar; progress->setStyle(&style1); |