diff options
| author | Gunnar Sletta <gunnar.sletta@digia.com> | 2013-01-28 08:59:43 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-01-31 07:06:06 +0100 |
| commit | 08a83c42ad441044c669c909fecd80529d02df5a (patch) | |
| tree | aec1303aee7ebf7513bca9a1125864bccd522b1e /tests/auto/quick/qquickitem | |
| parent | 4e58e01f409104003ab4359cb4cac706b332c896 (diff) | |
Reenable tst_QQuickItem::simpleFocus and fix warnings.
As a result of 1512835ee1425a3e874d2f2dd2b01f1a1ea7b763,
the simpleFocus test now passes on Mac and can be reneabled.
I also took the liberty of making sure windows have a valid
geometry, so that we don't get tons of warnings.
Task-number: QTBUG-24094
Change-Id: I5b8bc82f3f5397110f6e487898d511e810bae59d
Reviewed-by: Alan Alpert <aalpert@rim.com>
Diffstat (limited to 'tests/auto/quick/qquickitem')
| -rw-r--r-- | tests/auto/quick/qquickitem/tst_qquickitem.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/tests/auto/quick/qquickitem/tst_qquickitem.cpp b/tests/auto/quick/qquickitem/tst_qquickitem.cpp index 2d8db6ef17..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()); |