diff options
| author | Andrew den Exter <andrew.den-exter@nokia.com> | 2012-02-01 17:09:39 +1000 |
|---|---|---|
| committer | Andrew den Exter <andrew.den-exter@nokia.com> | 2012-02-02 00:28:25 +0100 |
| commit | 7b15b87ee72ffb583b317f672115be3d5437601a (patch) | |
| tree | 1c28b2e60c81dc7c227c8b28286e661cb54c3b8f | |
| parent | 4af3a3abdef768ff067fa23e6dece058d7a6b9e1 (diff) | |
Fix QDeclarativeApplication test failure.
QApplication::setActiveWindow(0) doesn't deactivate the application
on all platforms, activating a null window through
QWindowSystemInterface does.
Change-Id: Id46a32a36a511756851f7c44a18f76af72ff1e03
Reviewed-by: Matthew Vogt <matthew.vogt@nokia.com>
| -rw-r--r-- | tests/auto/declarative/qdeclarativeapplication/tst_qdeclarativeapplication.cpp | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/tests/auto/declarative/qdeclarativeapplication/tst_qdeclarativeapplication.cpp b/tests/auto/declarative/qdeclarativeapplication/tst_qdeclarativeapplication.cpp index cafcfba0..317bed72 100644 --- a/tests/auto/declarative/qdeclarativeapplication/tst_qdeclarativeapplication.cpp +++ b/tests/auto/declarative/qdeclarativeapplication/tst_qdeclarativeapplication.cpp @@ -87,13 +87,8 @@ void tst_qdeclarativeapplication::active() QCOMPARE(item->property("active").toBool(), QApplication::activeWindow() != 0); // not active again - // on mac, setActiveWindow(0) on mac does not deactivate the current application - // (you have to switch to a different app or hide the current app to trigger this) -#if !defined(Q_WS_MAC) - QApplication::setActiveWindow(0); - QVERIFY(!item->property("active").toBool()); - QCOMPARE(item->property("active").toBool(), QApplication::activeWindow() != 0); -#endif + QWindowSystemInterface::handleWindowActivated(0); + QTRY_VERIFY(!item->property("active").toBool()); } void tst_qdeclarativeapplication::layoutDirection() |