diff options
author | Kurt Korbatits <kurt.korbatits@nokia.com> | 2012-01-18 12:32:58 +1000 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-01-19 04:45:29 +0100 |
commit | 3664d3b8426c05814cbf327ba010c5bec24853ef (patch) | |
tree | d8300ba30e61390f4c2c23fe95b9423406a5b426 /tests/auto/xml/sax/qxml | |
parent | 67a3698b3c558b5bd9fbd2e3b0121bab8c949c95 (diff) |
Changed xml unittests to work from installation directory
- Changed to use QFINDTESTDATA and TESTDATA
Change-Id: Ib738adfb6d0553e4c995ccaa51e34335f00f50f0
Reviewed-by: Kurt Korbatits <kurt.korbatits@nokia.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
Diffstat (limited to 'tests/auto/xml/sax/qxml')
-rw-r--r-- | tests/auto/xml/sax/qxml/qxml.pro | 6 | ||||
-rw-r--r-- | tests/auto/xml/sax/qxml/tst_qxml.cpp | 5 |
2 files changed, 5 insertions, 6 deletions
diff --git a/tests/auto/xml/sax/qxml/qxml.pro b/tests/auto/xml/sax/qxml/qxml.pro index 4f2e427d14..e0b48ad9f5 100644 --- a/tests/auto/xml/sax/qxml/qxml.pro +++ b/tests/auto/xml/sax/qxml/qxml.pro @@ -4,8 +4,4 @@ TARGET = tst_qxml SOURCES += tst_qxml.cpp QT = core xml testlib -wince* { - addFiles.files = 0x010D.xml - addFiles.path = . - DEPLOYMENT += addFiles -} +TESTDATA += 0x010D.xml diff --git a/tests/auto/xml/sax/qxml/tst_qxml.cpp b/tests/auto/xml/sax/qxml/tst_qxml.cpp index afe219c635..14f4e554aa 100644 --- a/tests/auto/xml/sax/qxml/tst_qxml.cpp +++ b/tests/auto/xml/sax/qxml/tst_qxml.cpp @@ -196,7 +196,10 @@ void tst_QXml::interpretedAs0D() const QChar(0x010D) + QLatin1String("reated-by=\"an attr value\"/>")); - QFile f("0x010D.xml"); + QString testFile = QFINDTESTDATA("0x010D.xml"); + if (testFile.isEmpty()) + QFAIL("Cannot find test file 0x010D.xml!"); + QFile f(testFile); QVERIFY(f.open(QIODevice::ReadOnly)); QXmlInputSource data(&f); |