From 7e973ea4a883a3af8d9d4dab0e125e254305ff23 Mon Sep 17 00:00:00 2001 From: Damian Jansen Date: Fri, 13 Jan 2012 12:08:20 +1000 Subject: Use QGuiApplication, not QApplication, in tests Change-Id: I7802293e6cafb90686c103972bc036cf74184714 Reviewed-by: Alan Alpert --- tests/auto/qtquick2/qquicktext/tst_qquicktext.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'tests/auto/qtquick2/qquicktext/tst_qquicktext.cpp') diff --git a/tests/auto/qtquick2/qquicktext/tst_qquicktext.cpp b/tests/auto/qtquick2/qquicktext/tst_qquicktext.cpp index b76f764cce..0e8eab18be 100644 --- a/tests/auto/qtquick2/qquicktext/tst_qquicktext.cpp +++ b/tests/auto/qtquick2/qquicktext/tst_qquicktext.cpp @@ -558,7 +558,7 @@ void tst_qquicktext::alignments() canvas->show(); canvas->requestActivateWindow(); QTest::qWait(50); - QTRY_COMPARE(QApplication::activeWindow(), static_cast(canvas)); + QTRY_COMPARE(QGuiApplication::activeWindow(), static_cast(canvas)); QObject *ob = canvas->rootObject(); QVERIFY(ob != 0); @@ -571,7 +571,7 @@ void tst_qquicktext::alignments() canvas->render(&p); QImage expect(expectfile); - if (QApplicationPrivate::graphics_system_name == "raster" || QApplicationPrivate::graphics_system_name == "") { + if (QGuiApplicationPrivate::graphics_system_name == "raster" || QGuiApplicationPrivate::graphics_system_name == "") { QCOMPARE(actual,expect); } delete canvas; -- cgit v1.2.3