Changed qimage unittest to work from installation.

- Changed to use QFINDTESTDATA and TESTDATA

Change-Id: I7aaf4d16b03373be0fef39fe05c0df0d947dc7e3
Reviewed-by: Kurt Korbatits  <kurt.korbatits@nokia.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
bb10
Kurt Korbatits 2012-01-16 14:00:48 +10:00 committed by Qt by Nokia
parent b93ce4d78c
commit bd0c7aa315
2 changed files with 5 additions and 9 deletions

View File

@ -4,11 +4,4 @@ SOURCES += tst_qimage.cpp
QT += core-private gui-private testlib
wince*: {
addImages.files = images/*
addImages.path = images
DEPLOYMENT += addImages
DEFINES += SRCDIR=\\\".\\\"
} else {
DEFINES += SRCDIR=\\\"$$PWD\\\"
}
TESTDATA += images/*

View File

@ -261,7 +261,10 @@ void tst_QImage::formatHandlersInput_data()
{
QTest::addColumn<QString>("testFormat");
QTest::addColumn<QString>("testFile");
const QString prefix = QLatin1String(SRCDIR) + "/images/";
const QString prefix = QFINDTESTDATA("images/");
if (prefix.isEmpty())
QFAIL("can not find images directory!");
// add a new line here when a file is added
QTest::newRow("ICO") << "ICO" << prefix + "image.ico";