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/dialogs | |
| 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/dialogs')
| -rw-r--r-- | tests/auto/widgets/dialogs/qmessagebox/tst_qmessagebox.cpp | 3 | ||||
| -rw-r--r-- | tests/auto/widgets/dialogs/qwizard/tst_qwizard.cpp | 21 |
2 files changed, 1 insertions, 23 deletions
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 |