diff options
| author | Liang Qi <liang.qi@digia.com> | 2014-01-07 08:33:33 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-01-07 18:55:07 +0100 |
| commit | dbaff44ff1ebf04c5d2533f7a345db09cd55b00d (patch) | |
| tree | d994f53bedfd895efae55ae4c07ffce90c1e25fb /tests/auto | |
| parent | 3b2143bdf79d84d79a1a1163212b8deaebb13820 (diff) | |
test: fix tst_QPushButton::sizeHint() with Mac style on Mac OS X
The style name should be macintosh, not mac.
This also reverts commit 2f46ea9fd677ffff3592b096db4aecdaaaa2b5aa.
Task-number: QTBUG-23680
Change-Id: I7fd06da165ca5bc99801c13af13fdb3d35119566
Reviewed-by: Sergio Ahumada <sahumada@blackberry.com>
Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
Diffstat (limited to 'tests/auto')
| -rw-r--r-- | tests/auto/widgets/widgets/qpushbutton/tst_qpushbutton.cpp | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/tests/auto/widgets/widgets/qpushbutton/tst_qpushbutton.cpp b/tests/auto/widgets/widgets/qpushbutton/tst_qpushbutton.cpp index 75c826c4cc..d336d00b3e 100644 --- a/tests/auto/widgets/widgets/qpushbutton/tst_qpushbutton.cpp +++ b/tests/auto/widgets/widgets/qpushbutton/tst_qpushbutton.cpp @@ -566,7 +566,7 @@ void tst_QPushButton::sizeHint_data() QTest::newRow("gtk") << QString::fromLatin1("gtk"); #endif #if defined(Q_OS_MAC) && !defined(QT_NO_STYLE_MAC) - QTest::newRow("mac") << QString::fromLatin1("mac"); + QTest::newRow("macintosh") << QString::fromLatin1("macintosh"); #endif #if !defined(QT_NO_STYLE_FUSION) QTest::newRow("fusion") << QString::fromLatin1("fusion"); @@ -589,11 +589,6 @@ void tst_QPushButton::sizeHint() { QFETCH(QString, stylename); -#ifdef Q_OS_MAC - if (stylename == "mac") - QSKIP("QStyleFactory cannot create the Mac style, see QTBUG-23680"); -#endif - QStyle *style = QStyleFactory::create(stylename); if (!style) QFAIL(qPrintable(QString::fromLatin1("Cannot create style: %1").arg(stylename))); |