summaryrefslogtreecommitdiffstats
path: root/tests/auto/gui
diff options
context:
space:
mode:
Diffstat (limited to 'tests/auto/gui')
-rw-r--r--tests/auto/gui/image/qicoimageformat/qicoimageformat.pro8
-rw-r--r--tests/auto/gui/image/qicoimageformat/tst_qicoimageformat.cpp6
2 files changed, 5 insertions, 9 deletions
diff --git a/tests/auto/gui/image/qicoimageformat/qicoimageformat.pro b/tests/auto/gui/image/qicoimageformat/qicoimageformat.pro
index 0ad195f629..fc25d7567a 100644
--- a/tests/auto/gui/image/qicoimageformat/qicoimageformat.pro
+++ b/tests/auto/gui/image/qicoimageformat/qicoimageformat.pro
@@ -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/*
diff --git a/tests/auto/gui/image/qicoimageformat/tst_qicoimageformat.cpp b/tests/auto/gui/image/qicoimageformat/tst_qicoimageformat.cpp
index 40cd9b848a..365b570761 100644
--- a/tests/auto/gui/image/qicoimageformat/tst_qicoimageformat.cpp
+++ b/tests/auto/gui/image/qicoimageformat/tst_qicoimageformat.cpp
@@ -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()