Cocoa: enable more autotests for qwidget as a result of Alien

1 files changed, 9 insertions, 6 deletions

diff --git a/tests/auto/qwidget/tst_qwidget.cpp b/tests/auto/qwidget/tst_qwidget.cpp
index 8ee6f58..2208bea 100644
--- a/tests/auto/qwidget/tst_qwidget.cpp
+++ b/tests/auto/qwidget/tst_qwidget.cpp
@@ -2745,9 +2745,6 @@ void tst_QWidget::lostUpdatesOnHide()
 
 void tst_QWidget::raise()
 {
-#ifdef QT_MAC_USE_COCOA
-    QSKIP("Cocoa has no Z-Order for views, we hack it, but it results in paint events.", SkipAll);
-#endif
     QTest::qWait(10);
     QWidget *parent = new QWidget(0);
     QList<UpdateWidget *> allChildren;
@@ -2772,6 +2769,12 @@ void tst_QWidget::raise()
     QTest::qWaitForWindowShown(parent);
     QTest::qWait(10);
 
+#ifdef QT_MAC_USE_COCOA
+    if (child1->internalWinId()) {
+        QSKIP("Cocoa has no Z-Order for views, we hack it, but it results in paint events.", SkipAll);
+    }
+#endif
+
     QList<QObject *> list1;
     list1 << child1 << child2 << child3 << child4;
     QVERIFY(parent->children() == list1);
@@ -2796,6 +2799,9 @@ void tst_QWidget::raise()
     foreach (UpdateWidget *child, allChildren) {
         int expectedPaintEvents = child == child2 ? 1 : 0;
         int expectedZOrderChangeEvents = child == child2 ? 1 : 0;
+#ifdef QT_MAC_USE_COCOA
+        QSKIP("Not yet sure why this fails.", SkipSingle);
+#endif
         QTRY_COMPARE(child->numPaintEvents, expectedPaintEvents);
         QCOMPARE(child->numZOrderChangeEvents, expectedZOrderChangeEvents);
         child->reset();
@@ -3046,9 +3052,6 @@ protected:
 
 void tst_QWidget::testContentsPropagation()
 {
-#ifdef Q_WS_MAC
-    QSKIP("Pixmap is not antialiased whereas widget is.", SkipAll);
-#endif
     ContentsPropagationWidget widget;
 #ifdef Q_WS_QWS
     widget.resize(500,500);