diff options
| author | Damian Jansen <damian.jansen@nokia.com> | 2012-01-13 12:08:20 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-01-13 05:36:11 +0100 |
| commit | 7e973ea4a883a3af8d9d4dab0e125e254305ff23 (patch) | |
| tree | ff6314d6276901a3465897bbff1fbce2447a10c4 /tests/auto/qtquick2/qquicktext/tst_qquicktext.cpp | |
| parent | 2671fa8bfd555a414f5dedc3866f87a5fa44893a (diff) | |
Use QGuiApplication, not QApplication, in tests
Change-Id: I7802293e6cafb90686c103972bc036cf74184714
Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
Diffstat (limited to 'tests/auto/qtquick2/qquicktext/tst_qquicktext.cpp')
| -rw-r--r-- | tests/auto/qtquick2/qquicktext/tst_qquicktext.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
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<QWidget *>(canvas)); + QTRY_COMPARE(QGuiApplication::activeWindow(), static_cast<QWidget *>(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; |