diff options
author | Kurt Korbatits <kurt.korbatits@nokia.com> | 2012-01-17 09:36:37 +1000 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-01-17 04:54:18 +0100 |
commit | 5ef5b8f4192c18c0df79d16f49a687b361d5baf7 (patch) | |
tree | 1f6cdbb5d01137f9ac969f25d6d79de1961d4698 /tests/auto/gui/image/qicoimageformat/tst_qicoimageformat.cpp | |
parent | 5027368077252affe11ee839786298a68c537d5b (diff) |
Changed qicoimageformat unittest to work from installation directory
- 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>
Diffstat (limited to 'tests/auto/gui/image/qicoimageformat/tst_qicoimageformat.cpp')
-rw-r--r-- | tests/auto/gui/image/qicoimageformat/tst_qicoimageformat.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
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() |