From 2753e9a795537df10c5a3b64ec9f6d8d81381837 Mon Sep 17 00:00:00 2001 From: Thiago Macieira Date: Mon, 25 Jun 2012 00:11:00 +0200 Subject: [PATCH] activeWindow is deprecated, use focusWindow. Change-Id: I846d3121b7e17bcb07bc891e5a8ad9473439e5d9 Reviewed-by: Lars Knoll --- tests/auto/quick/qquickapplication/tst_qquickapplication.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/auto/quick/qquickapplication/tst_qquickapplication.cpp b/tests/auto/quick/qquickapplication/tst_qquickapplication.cpp index 3d02dce..287ccef 100644 --- a/tests/auto/quick/qquickapplication/tst_qquickapplication.cpp +++ b/tests/auto/quick/qquickapplication/tst_qquickapplication.cpp @@ -85,7 +85,7 @@ void tst_qquickapplication::active() // not active QVERIFY(!item->property("active").toBool()); QVERIFY(!item->property("active2").toBool()); - QCOMPARE(item->property("active").toBool(), QGuiApplication::activeWindow() != 0); + QCOMPARE(item->property("active").toBool(), QGuiApplication::focusWindow() != 0); // active view.show(); @@ -93,8 +93,8 @@ void tst_qquickapplication::active() QTest::qWait(50); QEXPECT_FAIL("", "QTBUG-21573", Abort); QTRY_COMPARE(view.status(), QQuickView::Ready); - QCOMPARE(item->property("active").toBool(), QGuiApplication::activeWindow() != 0); - QCOMPARE(item->property("active2").toBool(), QGuiApplication::activeWindow() != 0); + QCOMPARE(item->property("active").toBool(), QGuiApplication::focusWindow() != 0); + QCOMPARE(item->property("active2").toBool(), QGuiApplication::focusWindow() != 0); #if 0 // QGuiApplication has no equivalent of setActiveWindow(0). QTBUG-21573 @@ -107,7 +107,7 @@ void tst_qquickapplication::active() // not active again QGuiApplication::setActiveWindow(0); QVERIFY(!item->property("active").toBool()); - QCOMPARE(item->property("active").toBool(), QGuiApplication::activeWindow() != 0); + QCOMPARE(item->property("active").toBool(), QGuiApplication::focusWindow() != 0); #endif } -- 2.7.4