diff options
| author | Tor Arne Vestbø <tor.arne.vestbo@digia.com> | 2012-10-26 12:28:31 +0200 |
|---|---|---|
| committer | Tor Arne Vestbø <tor.arne.vestbo@digia.com> | 2012-10-26 12:28:53 +0200 |
| commit | 6e5818f2bbc8443b9308252a5e1543e014ef439d (patch) | |
| tree | 07922adee2f13e818b9439c8a0bdf871dda59039 /tests/auto/widgets/widgets/qpushbutton | |
| parent | 32aac0a1c009ee940920fd12f277180dd80b8eff (diff) | |
| parent | deac55becd18efa4504eb686a1bb8081a5cd488a (diff) | |
Merge remote-tracking branch 'gerrit/master' into newdocs
Change-Id: I10cf9f915c602c8e5a0e7d7c9e17b7bc5ca00640
Diffstat (limited to 'tests/auto/widgets/widgets/qpushbutton')
| -rw-r--r-- | tests/auto/widgets/widgets/qpushbutton/tst_qpushbutton.cpp | 7 |
1 files changed, 2 insertions, 5 deletions
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"); |