From 7b15b87ee72ffb583b317f672115be3d5437601a Mon Sep 17 00:00:00 2001 From: Andrew den Exter Date: Wed, 1 Feb 2012 17:09:39 +1000 Subject: 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 --- .../qdeclarativeapplication/tst_qdeclarativeapplication.cpp | 9 ++------- 1 file 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() -- cgit v1.2.3