diff options
| author | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2009-11-03 14:45:10 (GMT) |
|---|---|---|
| committer | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2009-11-03 14:46:17 (GMT) |
| commit | fc45c07c27100591750ad5c360fde535e15b9dbd (patch) | |
| tree | 09d916d0253be46db799f4cab4facae41682febd /tests/auto/xmlpatterns | |
| parent | 33489bcf46d681caba6cf107a79593302d48b1db (diff) | |
| download | Qt-fc45c07c27100591750ad5c360fde535e15b9dbd.zip Qt-fc45c07c27100591750ad5c360fde535e15b9dbd.tar.gz Qt-fc45c07c27100591750ad5c360fde535e15b9dbd.tar.bz2 | |
Made xmlpatterns autotests compile for Symbian
Fixed xmlpatterns autotests so that they compile for Symbian with
both RVCT and NokiaX86 compilers.
Reviewed-by: Janne Koskinen
Diffstat (limited to 'tests/auto/xmlpatterns')
| -rw-r--r-- | tests/auto/xmlpatterns/tst_xmlpatterns.cpp | 10 | ||||
| -rw-r--r-- | tests/auto/xmlpatterns/xmlpatterns.pro | 6 |
2 files changed, 12 insertions, 4 deletions
diff --git a/tests/auto/xmlpatterns/tst_xmlpatterns.cpp b/tests/auto/xmlpatterns/tst_xmlpatterns.cpp index 0dcb070..22f6693 100644 --- a/tests/auto/xmlpatterns/tst_xmlpatterns.cpp +++ b/tests/auto/xmlpatterns/tst_xmlpatterns.cpp @@ -48,6 +48,10 @@ #include "../qxmlquery/TestFundament.h" #include "../network-settings.h" +#if defined(Q_OS_SYMBIAN) +#define SRCDIR "" +#endif + /*! \class tst_XmlPatterns \internal @@ -130,6 +134,8 @@ void tst_XmlPatterns::xquerySupport() #ifdef Q_OS_WINCE QSKIP("WinCE: This test uses unsupported WinCE functionality", SkipAll); +#elif defined(Q_OS_SYMBIAN) + QSKIP("Symbian: This test uses unsupported Symbian functionality (QProcess with std streams)", SkipAll); #endif QFETCH(int, expectedExitCode); @@ -218,7 +224,7 @@ void tst_XmlPatterns::xquerySupport() void tst_XmlPatterns::xquerySupport_data() const { -#ifdef Q_OS_WINCE +#if defined(Q_OS_WINCE) || defined(Q_OS_SYMBIAN) return; #endif @@ -849,6 +855,8 @@ void tst_XmlPatterns::xsltSupport_data() const #ifdef Q_OS_WINCE QSKIP("WinCE: This test uses unsupported WinCE functionality", SkipAll); +#elif defined(Q_OS_SYMBIAN) + QSKIP("Symbian: This test uses unsupported Symbian functionality (QProcess with std streams)", SkipAll); #endif QTest::addColumn<int>("expectedExitCode"); diff --git a/tests/auto/xmlpatterns/xmlpatterns.pro b/tests/auto/xmlpatterns/xmlpatterns.pro index 01e3b2b..54dd9aa 100644 --- a/tests/auto/xmlpatterns/xmlpatterns.pro +++ b/tests/auto/xmlpatterns/xmlpatterns.pro @@ -2,10 +2,10 @@ load(qttest_p4) SOURCES += tst_xmlpatterns.cpp \ ../qxmlquery/TestFundament.cpp -!wince* { -DEFINES += SRCDIR=\\\"$$PWD/\\\" -} else { +wince* { DEFINES += SRCDIR=\\\"./\\\" +} else:!symbian { +DEFINES += SRCDIR=\\\"$$PWD/\\\" } include (../xmlpatterns.pri) |