diff options
Diffstat (limited to 'tests/auto')
14 files changed, 61 insertions, 106 deletions
diff --git a/tests/auto/other/qaccessibilitylinux/tst_qaccessibilitylinux.cpp b/tests/auto/other/qaccessibilitylinux/tst_qaccessibilitylinux.cpp index ea13af0d2d..783ffc7a41 100644 --- a/tests/auto/other/qaccessibilitylinux/tst_qaccessibilitylinux.cpp +++ b/tests/auto/other/qaccessibilitylinux/tst_qaccessibilitylinux.cpp @@ -164,8 +164,8 @@ QDBusInterface *tst_QtAtSpi::getInterface(const QString &path, const QString &in void tst_QtAtSpi::initTestCase() { // Oxygen style creates many extra items, it's simply unusable here - qDebug() << "Using plastique style..."; - qApp->setStyle("plastique"); + qDebug() << "Using fusion style..."; + qApp->setStyle("fusion"); qApp->setApplicationName("tst_QtAtSpi app"); dbus = DBusConnection(); diff --git a/tests/auto/widgets/dialogs/qmessagebox/tst_qmessagebox.cpp b/tests/auto/widgets/dialogs/qmessagebox/tst_qmessagebox.cpp index 17b574fab7..cd52977d61 100644 --- a/tests/auto/widgets/dialogs/qmessagebox/tst_qmessagebox.cpp +++ b/tests/auto/widgets/dialogs/qmessagebox/tst_qmessagebox.cpp @@ -53,9 +53,6 @@ #if defined(Q_OS_MAC) && !defined(QT_NO_STYLE_MAC) #include <QMacStyle> #endif -#if !defined(QT_NO_STYLE_CLEANLOOKS) -#include <QCleanlooksStyle> -#endif #define CONVENIENCE_FUNC_SYMS(func) \ { \ diff --git a/tests/auto/widgets/dialogs/qwizard/tst_qwizard.cpp b/tests/auto/widgets/dialogs/qwizard/tst_qwizard.cpp index 99404bc113..60163f5037 100644 --- a/tests/auto/widgets/dialogs/qwizard/tst_qwizard.cpp +++ b/tests/auto/widgets/dialogs/qwizard/tst_qwizard.cpp @@ -50,8 +50,7 @@ #include <QToolButton> #include <QVBoxLayout> #include <QWizard> -#include <QStyle> -#include <QPlastiqueStyle> +#include <QWindowsStyle> #include <QTreeWidget> static QImage grabWidget(QWidget *window) @@ -104,7 +103,6 @@ private slots: void sideWidget(); // task-specific tests below me: - void task161660_buttonSpacing(); void task177716_disableCommitButton(); void task183550_stretchFactor(); void task161658_alignments(); @@ -2400,23 +2398,6 @@ void tst_QWizard::sideWidget() QVERIFY(wizard.sideWidget() == 0); } -void tst_QWizard::task161660_buttonSpacing() -{ -#ifndef QT_NO_STYLE_PLASTIQUE - QString origStyle = QApplication::style()->objectName(); - QApplication::setStyle(new QPlastiqueStyle); - QWizard wizard; - wizard.addPage(new QWizardPage); - wizard.show(); - const QAbstractButton *finishButton = wizard.button(QWizard::FinishButton); - const QAbstractButton *cancelButton = wizard.button(QWizard::CancelButton); - const int spacing = cancelButton->geometry().left() - finishButton->geometry().right() - 1; - QCOMPARE(spacing, wizard.style()->layoutSpacing( - QSizePolicy::PushButton, QSizePolicy::PushButton, Qt::Horizontal)); - QApplication::setStyle(origStyle); -#endif -} - class task177716_CommitPage : public QWizardPage { Q_OBJECT diff --git a/tests/auto/widgets/graphicsview/qgraphicslinearlayout/tst_qgraphicslinearlayout.cpp b/tests/auto/widgets/graphicsview/qgraphicslinearlayout/tst_qgraphicslinearlayout.cpp index d39c65ab53..d69ea1d9f1 100644 --- a/tests/auto/widgets/graphicsview/qgraphicslinearlayout/tst_qgraphicslinearlayout.cpp +++ b/tests/auto/widgets/graphicsview/qgraphicslinearlayout/tst_qgraphicslinearlayout.cpp @@ -47,7 +47,7 @@ #include <qgraphicsscene.h> #include <qgraphicsview.h> #include <qapplication.h> -#include <qplastiquestyle.h> +#include <qwindowsstyle.h> class tst_QGraphicsLinearLayout : public QObject { Q_OBJECT @@ -152,11 +152,7 @@ void tst_QGraphicsLinearLayout::initTestCase() { // since the style will influence the results, we have to ensure // that the tests are run using the same style on all platforms -#if defined (Q_OS_WINCE) QApplication::setStyle(new QWindowsStyle); -#else - QApplication::setStyle(new QPlastiqueStyle); -#endif } // This will be called after the last test function is executed. diff --git a/tests/auto/widgets/graphicsview/qgraphicsproxywidget/tst_qgraphicsproxywidget.cpp b/tests/auto/widgets/graphicsview/qgraphicsproxywidget/tst_qgraphicsproxywidget.cpp index 883c47b26a..7a256972f2 100644 --- a/tests/auto/widgets/graphicsview/qgraphicsproxywidget/tst_qgraphicsproxywidget.cpp +++ b/tests/auto/widgets/graphicsview/qgraphicsproxywidget/tst_qgraphicsproxywidget.cpp @@ -434,8 +434,8 @@ void tst_QGraphicsProxyWidget::setWidget() #endif widget->setPalette(QPalette(Qt::magenta)); widget->setLayoutDirection(Qt::RightToLeft); - QCleanlooksStyle cleanlooksStyle; - widget->setStyle(&cleanlooksStyle); + QFusionStyle fusionStyle; + widget->setStyle(&fusionStyle); widget->setFont(QFont("Times")); widget->setVisible(true); QApplication::setActiveWindow(widget); diff --git a/tests/auto/widgets/graphicsview/qgraphicsview/tst_qgraphicsview.cpp b/tests/auto/widgets/graphicsview/qgraphicsview/tst_qgraphicsview.cpp index d2b7001e93..57b7d08ab0 100644 --- a/tests/auto/widgets/graphicsview/qgraphicsview/tst_qgraphicsview.cpp +++ b/tests/auto/widgets/graphicsview/qgraphicsview/tst_qgraphicsview.cpp @@ -55,9 +55,6 @@ #if !defined(QT_NO_STYLE_WINDOWS) #include <QtWidgets/QWindowsStyle> #endif -#if !defined(QT_NO_STYLE_PLASTIQUE) -#include <QtWidgets/QPlastiqueStyle> -#endif #include <QtGui/QPainterPath> #include <QtWidgets/QRubberBand> #include <QtWidgets/QScrollBar> @@ -2770,16 +2767,10 @@ void tst_QGraphicsView::scrollBarRanges() view.setFrameStyle(useStyledPanel ? QFrame::StyledPanel : QFrame::NoFrame); if (useMotif) { -#if !defined(QT_NO_STYLE_WINDOWS) view.setStyle(new FauxMotifStyle); -#else - QSKIP("No Windows style compiled."); -#endif } else { -#if defined(Q_OS_WINCE) +#if !defined(QT_NO_STYLE_WINDOWS) view.setStyle(new QWindowsStyle); -#elif !defined(QT_NO_STYLE_PLASTIQUE) - view.setStyle(new QPlastiqueStyle); #endif } view.setStyleSheet(" "); // enables style propagation ;-) @@ -3291,9 +3282,7 @@ void tst_QGraphicsView::scrollAfterResize_data() QTest::addColumn<QTransform>("x2"); QTest::addColumn<QTransform>("x3"); -#if !defined(QT_NO_STYLE_PLASTIQUE) - QPlastiqueStyle style; -#elif !defined(QT_NO_STYLE_WINDOWS) +#if !defined(QT_NO_STYLE_WINDOWS) QWindowsStyle style; #else QCommonStyle style; @@ -3322,9 +3311,7 @@ void tst_QGraphicsView::scrollAfterResize() QFETCH(QTransform, x2); QFETCH(QTransform, x3); -#if !defined(QT_NO_STYLE_PLASTIQUE) - QPlastiqueStyle style; -#elif !defined(QT_NO_STYLE_WINDOWS) +#if !defined(QT_NO_STYLE_WINDOWS) QWindowsStyle style; #else QCommonStyle style; 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() diff --git a/tests/auto/widgets/itemviews/qlistview/tst_qlistview.cpp b/tests/auto/widgets/itemviews/qlistview/tst_qlistview.cpp index 9f3cd0a3e1..8458ca78fb 100644 --- a/tests/auto/widgets/itemviews/qlistview/tst_qlistview.cpp +++ b/tests/auto/widgets/itemviews/qlistview/tst_qlistview.cpp @@ -55,6 +55,11 @@ #include <QtWidgets/QScrollBar> #include <QtWidgets/QDialog> #include <QtWidgets/QStyledItemDelegate> + +#if !defined(QT_NO_STYLE_WINDOWS) +#include <qwindowsstyle.h> +#endif // QT_NO_STYLE_WINDOWS + #if defined(Q_OS_WIN) || defined(Q_OS_WINCE) # include <windows.h> # include <QtGui/QGuiApplication> @@ -2190,6 +2195,11 @@ void tst_QListView::taskQTBUG_21804_hiddenItemsAndScrollingWithKeys() // create listview QListView lv; +#if !defined(QT_NO_STYLE_WINDOWS) + // The test fails on Fusion style + // See https://bugreports.qt-project.org/browse/QTBUG-27675 + lv.setStyle(new QWindowsStyle()); +#endif lv.setFlow(static_cast<QListView::Flow>(flow)); lv.setSpacing(spacing); lv.setModel(&model); diff --git a/tests/auto/widgets/kernel/qformlayout/tst_qformlayout.cpp b/tests/auto/widgets/kernel/qformlayout/tst_qformlayout.cpp index 6ebeea218f..ade2140b62 100644 --- a/tests/auto/widgets/kernel/qformlayout/tst_qformlayout.cpp +++ b/tests/auto/widgets/kernel/qformlayout/tst_qformlayout.cpp @@ -50,7 +50,6 @@ #include <QtWidgets/QLabel> #include <QtWidgets/QLineEdit> #include <QtWidgets/QPushButton> -#include <QtWidgets/QPlastiqueStyle> #include <QtWidgets/QWindowsStyle> #include <QStyleFactory> @@ -403,7 +402,7 @@ void tst_QFormLayout::setFormStyle() QFormLayout layout; widget.setLayout(&layout); -#ifndef QT_NO_STYLE_PLASTIQUE +#if 0 // QT_NO_STYLE_PLASTIQUE widget.setStyle(new QPlastiqueStyle()); QVERIFY(layout.labelAlignment() == Qt::AlignRight); 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); diff --git a/tests/auto/widgets/styles/qstylesheetstyle/tst_qstylesheetstyle.cpp b/tests/auto/widgets/styles/qstylesheetstyle/tst_qstylesheetstyle.cpp index 4b2125ad6a..29846d619a 100644 --- a/tests/auto/widgets/styles/qstylesheetstyle/tst_qstylesheetstyle.cpp +++ b/tests/auto/widgets/styles/qstylesheetstyle/tst_qstylesheetstyle.cpp @@ -44,7 +44,7 @@ #include <QtTest/QtTest> #include <QtDebug> #include <QMetaObject> -#include <QPlastiqueStyle> +#include <QFusionStyle> #include <private/qstylesheetstyle_p.h> @@ -1589,7 +1589,7 @@ class ChangeEventWidget : public QWidget static bool recurse = false; if (!recurse) { recurse = true; - QStyle *style = new QPlastiqueStyle; + QStyle *style = new QFusionStyle style->setParent(this); setStyle(style); recurse = false; 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"); |