From c298c7b73b029358e604564913e62c441b13e742 Mon Sep 17 00:00:00 2001 From: Kurt Korbatits Date: Fri, 27 Jan 2012 13:29:07 +1000 Subject: [PATCH] Changed qlabel unittest to work from install directory - Changed qlabel unittest to use TESTDATA and QFINDTESTDATA Change-Id: Ide6755cd79caf91b553fb6b1412da6fbab583720 Reviewed-by: Kurt Korbatits Reviewed-by: Jason McDonald Reviewed-by: Rohan McGovern --- tests/auto/widgets/widgets/qlabel/qlabel.pro | 9 +-------- tests/auto/widgets/widgets/qlabel/tst_qlabel.cpp | 4 ++-- 2 files changed, 3 insertions(+), 10 deletions(-) diff --git a/tests/auto/widgets/widgets/qlabel/qlabel.pro b/tests/auto/widgets/widgets/qlabel/qlabel.pro index 3aacb60..6a5757f 100644 --- a/tests/auto/widgets/widgets/qlabel/qlabel.pro +++ b/tests/auto/widgets/widgets/qlabel/qlabel.pro @@ -5,12 +5,5 @@ QT += widgets widgets-private testlib QT += core-private gui-private SOURCES += tst_qlabel.cpp -wince*::DEFINES += SRCDIR=\\\"\\\" -else:DEFINES += SRCDIR=\\\"$$PWD/\\\" -wince* { - addFiles.files = *.png \ - testdata - addFiles.path = . - DEPLOYMENT += addFiles -} +TESTDATA += testdata/* *.png diff --git a/tests/auto/widgets/widgets/qlabel/tst_qlabel.cpp b/tests/auto/widgets/widgets/qlabel/tst_qlabel.cpp index b3899a8..6d6b938 100644 --- a/tests/auto/widgets/widgets/qlabel/tst_qlabel.cpp +++ b/tests/auto/widgets/widgets/qlabel/tst_qlabel.cpp @@ -407,12 +407,12 @@ void tst_QLabel::task226479_movieResize() QMovie *movie = new QMovie( &label ); label.setMovie(movie); QTest::qWaitForWindowShown(&label); - movie->setFileName(SRCDIR "red.png"); + movie->setFileName(QFINDTESTDATA("red.png")); movie->start(); QTest::qWait(50); movie->stop(); label.paintedRegion = QRegion(); - movie->setFileName(SRCDIR "green.png"); + movie->setFileName(QFINDTESTDATA("green.png")); movie->start(); QTest::qWait(50); -- 2.7.4