summaryrefslogtreecommitdiffstats
path: root/tests/auto/widgets/graphicsview/qgraphicswidget/tst_qgraphicswidget.cpp
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/graphicsview/qgraphicswidget/tst_qgraphicswidget.cpp
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/graphicsview/qgraphicswidget/tst_qgraphicswidget.cpp')
-rw-r--r--tests/auto/widgets/graphicsview/qgraphicswidget/tst_qgraphicswidget.cpp16
1 files changed, 10 insertions, 6 deletions
diff --git a/tests/auto/widgets/graphicsview/qgraphicswidget/tst_qgraphicswidget.cpp b/tests/auto/widgets/graphicsview/qgraphicswidget/tst_qgraphicswidget.cpp
index 1987a37306..03814bcbf8 100644
--- a/tests/auto/widgets/graphicsview/qgraphicswidget/tst_qgraphicswidget.cpp
+++ b/tests/auto/widgets/graphicsview/qgraphicswidget/tst_qgraphicswidget.cpp
@@ -47,11 +47,13 @@
#include <qgraphicsview.h>
#include <qstyleoption.h>
#include <qgraphicslinearlayout.h>
-#include <qcleanlooksstyle.h>
#include <qlineedit.h>
#include <qboxlayout.h>
#include <qaction.h>
#include <qwidgetaction.h>
+#ifndef Q_NO_STYLE_FUSION
+#include <qfusionstyle.h>
+#endif
#include "../../../qtest-config.h"
@@ -1397,21 +1399,22 @@ void tst_QGraphicsWidget::setStyle_data()
{
QTest::addColumn<QString>("style");
QTest::newRow("null") << "";
- QTest::newRow("cleanlooks") << "QCleanlooksStyle";
+ QTest::newRow("fusion") << "QFusionStyle";
}
// void setStyle(QStyle* style) public
void tst_QGraphicsWidget::setStyle()
{
+#ifndef Q_NO_STYLE_FUSION
SubQGraphicsWidget widget;
- QCleanlooksStyle cleanlooksStyle;
+ QFusionStyle fusionStyle;
int oldEventCounts = widget.eventCount;
QFETCH(QString, style);
- if (style == "QCleanlooksStyle") {
- widget.setStyle(&cleanlooksStyle);
- QCOMPARE(widget.style(), static_cast<QStyle*>(&cleanlooksStyle));
+ if (style == "QFusionStyle") {
+ widget.setStyle(&fusionStyle);
+ QCOMPARE(widget.style(), static_cast<QStyle*>(&fusionStyle));
} else {
widget.setStyle(0);
QVERIFY(widget.style() != (QStyle *)0);
@@ -1421,6 +1424,7 @@ void tst_QGraphicsWidget::setStyle()
// cleanup
widget.setStyle(0);
+#endif
}
void tst_QGraphicsWidget::setTabOrder_data()