1 files changed, 3 insertions, 5 deletions
diff --git a/tests/auto/quick/qquickitem/tst_qquickitem.cpp b/tests/auto/quick/qquickitem/tst_qquickitem.cpp
index e237174eb1..a7343f686f 100644
--- a/tests/auto/quick/qquickitem/tst_qquickitem.cpp
+++ b/tests/auto/quick/qquickitem/tst_qquickitem.cpp
@@ -175,6 +175,8 @@ private:
     };
 
     void ensureFocus(QWindow *w) {
+        if (w->width() <=0 || w->height() <= 0)
+            w->setGeometry(100, 100, 400, 300);
         w->show();
         w->requestActivate();
         QTest::qWaitForWindowActive(w);
@@ -270,10 +272,6 @@ void tst_qquickitem::simpleFocus()
     QQuickWindow window;
     ensureFocus(&window);
 
-#ifdef Q_OS_MAC
-    QSKIP("QTBUG-24094: fails on Mac OS X 10.7");
-#endif
-
     QTRY_VERIFY(QGuiApplication::focusWindow() == &window);
 
     QQuickItem *l1c1 = new TestItem(window.contentItem());
@@ -732,7 +730,7 @@ void tst_qquickitem::focusSubItemInNonFocusScope()
     QQuickView *view = new QQuickView;
     view->setSource(testFileUrl("focusSubItemInNonFocusScope.qml"));
     view->show();
-    qApp->processEvents();
+    QTest::qWaitForWindowActive(view);
 
     QQuickItem *dummyItem = view->rootObject()->findChild<QQuickItem *>("dummyItem");
     QVERIFY(dummyItem);