diff options
| author | Sergio Ahumada <sahumada@blackberry.com> | 2014-06-03 15:02:32 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-06-03 15:48:31 +0200 |
| commit | 18b98775a453325d0e8f1cf8cffe4ac9cd4e0062 (patch) | |
| tree | f6de1e0c2e68a5256d807ab81aebe151e4aff66f | |
| parent | f34e5fdec8ed80344633ce2b1b140a3d156f616c (diff) | |
Fix tst_qdeclarativeapplication on OS X
This change is similar to qtdeclarative/a292bcb1438034a24e95ec08be04a76ba832d793
Change-Id: I2d758d6725b32a8f9779e14560b9b61271a5cb97
Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
| -rw-r--r-- | tests/auto/declarative/qdeclarativeapplication/tst_qdeclarativeapplication.cpp | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/tests/auto/declarative/qdeclarativeapplication/tst_qdeclarativeapplication.cpp b/tests/auto/declarative/qdeclarativeapplication/tst_qdeclarativeapplication.cpp index 5455dbff..d6c24619 100644 --- a/tests/auto/declarative/qdeclarativeapplication/tst_qdeclarativeapplication.cpp +++ b/tests/auto/declarative/qdeclarativeapplication/tst_qdeclarativeapplication.cpp @@ -87,9 +87,15 @@ void tst_qdeclarativeapplication::active() QCOMPARE(QApplication::activeWindow(), static_cast<QWidget *>(&view)); QCOMPARE(item->property("active").toBool(), QApplication::activeWindow() != 0); - // not active again QWindowSystemInterface::handleWindowActivated(0); + +#ifdef Q_OS_OSX + // OS X has the concept of "reactivation" + QTRY_VERIFY(item->property("active").toBool()); +#else + // not active again QTRY_VERIFY(!item->property("active").toBool()); +#endif } void tst_qdeclarativeapplication::layoutDirection() |