Merge remote-tracking branch 'origin/stable' into dev

Change-Id: I99af0bef7f1c931533a324ebcfb27c40ee871a5e

2 files changed, 1 insertions, 10 deletions

diff --git a/tests/auto/widgets/widgets/qmenu/tst_qmenu.cpp b/tests/auto/widgets/widgets/qmenu/tst_qmenu.cpp
index 9e181c0676..f7dff7bc57 100644
--- a/tests/auto/widgets/widgets/qmenu/tst_qmenu.cpp
+++ b/tests/auto/widgets/widgets/qmenu/tst_qmenu.cpp
@@ -1019,10 +1019,6 @@ private:
 
 void tst_QMenu::QTBUG_10735_crashWithDialog()
 {
-#ifdef Q_OS_MAC
-    QSKIP("Test currently hangs on Mac OS X, see QTBUG-23677");
-#endif
-
     MyMenu menu;
 
     QTimer::singleShot(1000, &menu, SLOT(activateLastAction()));
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)));