summaryrefslogtreecommitdiffstats
path: root/tests/auto/widgets/widgets/qcombobox
diff options
context:
space:
mode:
authorJens Bache-Wiig <jens.bache-wiig@digia.com>2012-10-18 15:22:15 +0200
committerThe Qt Project <gerrit-noreply@qt-project.org>2012-10-22 19:36:43 +0200
commit087e4bc5171f0ced1f34663e59217d678cd350ba (patch)
tree0d122365bbc8bd4147196a1b379e0f7e57d3eb8e /tests/auto/widgets/widgets/qcombobox
parenta0e5d6c1c05f1d9f811eaf2760193618ae8a83ca (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/qcombobox')
-rw-r--r--tests/auto/widgets/widgets/qcombobox/tst_qcombobox.cpp18
1 files changed, 9 insertions, 9 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;