AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Changed qicoimageformat unittest to work from installation directory

Browse Source 
- Changed to use QFINDTESTDATA and TESTDATA

Change-Id: Icbc823d87cdf6fd36a8ef10ade8e4bca7d9b1c3b
Reviewed-by: Kurt Korbatits  <kurt.korbatits@nokia.com>
Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
This commit is contained in:
Kurt Korbatits 2012-01-17 09:36:37 +10:00 committed by Qt by Nokia
parent 5027368077
commit 5ef5b8f419
2 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
tests/auto/gui/image/qicoimageformat/qicoimageformat.pro
View File

@ -4,16 +4,12 @@ SOURCES+= tst_qicoimageformat.cpp
QT += testlib
wince*: {
DEFINES += SRCDIR=\\\".\\\"
addFiles.files = icons
addFiles.path = .
CONFIG(debug, debug|release):{
addPlugins.files = $$QT_BUILD_TREE/plugins/imageformats/qico4d.dll
} else {
addPlugins.files = $$QT_BUILD_TREE/plugins/imageformats/qico4.dll
}
addPlugins.path = imageformats
DEPLOYMENT += addFiles addPlugins
} else {
DEFINES += SRCDIR=\\\"$$PWD\\\"
DEPLOYMENT += addPlugins
}
TESTDATA += icons/*

6
tests/auto/gui/image/qicoimageformat/tst_qicoimageformat.cpp
View File

@ -80,8 +80,6 @@ private:
tst_QIcoImageFormat::tst_QIcoImageFormat()
{
m_IconPath = QLatin1String(SRCDIR) + "/icons";
qDebug() << m_IconPath;
}
tst_QIcoImageFormat::~tst_QIcoImageFormat()
@ -101,7 +99,9 @@ void tst_QIcoImageFormat::cleanup()
void tst_QIcoImageFormat::initTestCase()
{
m_IconPath = QFINDTESTDATA("icons");
if (m_IconPath.isEmpty())
QFAIL("Cannot find icons directory containing testdata!");
}
void tst_QIcoImageFormat::cleanupTestCase()