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/widgets | |
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/widgets')
3 files changed, 13 insertions, 18 deletions
diff --git a/tests/auto/widgets/widgets/qcombobox/tst_qcombobox.cpp b/tests/auto/widgets/widgets/qcombobox/tst_qcombobox.cpp index bd16085639..11e9a9d82f 100644 --- a/tests/auto/widgets/widgets/qcombobox/tst_qcombobox.cpp +++ b/tests/auto/widgets/widgets/qcombobox/tst_qcombobox.cpp @@ -72,8 +72,8 @@ #include <qstringlist.h> #include <qvalidator.h> #include <qcompleter.h> -#ifndef QT_NO_STYLE_CLEANLOOKS -#include <qcleanlooksstyle.h> +#ifndef QT_NO_STYLE_FUSION +#include <qfusionstyle.h> #endif #include <qabstractitemview.h> #include <qstyleditemdelegate.h> @@ -133,7 +133,7 @@ private slots: void itemListPosition(); void separatorItem_data(); void separatorItem(); -#ifndef QT_NO_STYLE_CLEANLOOKS +#ifndef QT_NO_STYLE_FUSION void task190351_layout(); void task191329_size(); #endif @@ -1942,12 +1942,12 @@ void tst_QComboBox::separatorItem() } } -// This test requires the Cleanlooks style -#ifndef QT_NO_STYLE_CLEANLOOKS +// This test requires the Fusionstyle +#ifndef QT_NO_STYLE_FUSION void tst_QComboBox::task190351_layout() { const QString oldStyle = QApplication::style()->objectName(); - QApplication::setStyle(new QCleanlooksStyle); + QApplication::setStyle(new QFusionStyle); QComboBox listCombo; QListWidget *list = new QListWidget(); @@ -2007,12 +2007,12 @@ void tst_QComboBox::task166349_setEditableOnReturn() QCOMPARE(QLatin1String("two1"), comboBox.itemText(comboBox.count() - 1)); } -// This test requires the Cleanlooks style. -#ifndef QT_NO_STYLE_CLEANLOOKS +// This test requires the Fusion style. +#ifndef QT_NO_STYLE_FUSION void tst_QComboBox::task191329_size() { const QString oldStyle = QApplication::style()->objectName(); - QApplication::setStyle(new QCleanlooksStyle); + QApplication::setStyle(new QFusionStyle); QComboBox tableCombo; int rows; diff --git a/tests/auto/widgets/widgets/qprogressbar/tst_qprogressbar.cpp b/tests/auto/widgets/widgets/qprogressbar/tst_qprogressbar.cpp index 013d52253a..7024da9dd4 100644 --- a/tests/auto/widgets/widgets/qprogressbar/tst_qprogressbar.cpp +++ b/tests/auto/widgets/widgets/qprogressbar/tst_qprogressbar.cpp @@ -299,10 +299,8 @@ void tst_QProgressBar::task245201_testChangeStyleAndDelete_data() QTest::addColumn<QString>("style1_str"); QTest::addColumn<QString>("style2_str"); - QTest::newRow("plastique-windows") << QString::fromLatin1("plastique") << QString::fromLatin1("windows"); - QTest::newRow("mlotif-windows") << QString::fromLatin1("motif") << QString::fromLatin1("windows"); - QTest::newRow("cleanlooks-cde") << QString::fromLatin1("cleanlooks") << QString::fromLatin1("cde"); - QTest::newRow("gtk-plastique") << QString::fromLatin1("gtk") << QString::fromLatin1("plastique"); + QTest::newRow("fusion-windows") << QString::fromLatin1("fusion") << QString::fromLatin1("windows"); + QTest::newRow("gtk-fusion") << QString::fromLatin1("gtk") << QString::fromLatin1("fusion"); } void tst_QProgressBar::task245201_testChangeStyleAndDelete() diff --git a/tests/auto/widgets/widgets/qpushbutton/tst_qpushbutton.cpp b/tests/auto/widgets/widgets/qpushbutton/tst_qpushbutton.cpp index 30cc6a4294..9d16393861 100644 --- a/tests/auto/widgets/widgets/qpushbutton/tst_qpushbutton.cpp +++ b/tests/auto/widgets/widgets/qpushbutton/tst_qpushbutton.cpp @@ -564,17 +564,14 @@ void tst_QPushButton::sizeHint_data() #if !defined(QT_NO_STYLE_WINDOWS) QTest::newRow("windows") << QString::fromLatin1("windows"); #endif -#if !defined(QT_NO_STYLE_CLEANLOOKS) - QTest::newRow("cleanlooks") << QString::fromLatin1("cleanlooks"); -#endif #if !defined(QT_NO_STYLE_GTK) QTest::newRow("gtk") << QString::fromLatin1("gtk"); #endif #if defined(Q_OS_MAC) && !defined(QT_NO_STYLE_MAC) QTest::newRow("mac") << QString::fromLatin1("mac"); #endif -#if !defined(QT_NO_STYLE_PLASTIQUE) - QTest::newRow("plastique") << QString::fromLatin1("plastique"); +#if !defined(QT_NO_STYLE_FUSION) + QTest::newRow("fusion") << QString::fromLatin1("fusion"); #endif #if defined(Q_OS_WIN) && !defined(QT_NO_STYLE_WINDOWSXP) QTest::newRow("windowsxp") << QString::fromLatin1("windowsxp"); |