diff options
| author | Shane Kearns <shane.kearns@accenture.com> | 2010-10-19 09:12:30 (GMT) |
|---|---|---|
| committer | Shane Kearns <shane.kearns@accenture.com> | 2010-10-20 13:35:53 (GMT) |
| commit | 064c5714c2167fb2ddfb4f1ab2f706282444884f (patch) | |
| tree | 2c89a7a1bc55ec11e18dbc835592d21121d28f7c | |
| parent | 4bdf081da0276f55662de826568441ca0e85e877 (diff) | |
| download | Qt-064c5714c2167fb2ddfb4f1ab2f706282444884f.zip Qt-064c5714c2167fb2ddfb4f1ab2f706282444884f.tar.gz Qt-064c5714c2167fb2ddfb4f1ab2f706282444884f.tar.bz2 | |
Fix compile error in tst_qxmlstream
The same workaround used for other autotests, as the symbian build system
doesn't accept \" in DEFINES.
Reviewed-By: Janne Koskinen
| -rw-r--r-- | tests/auto/qxmlstream/qxmlstream.pro | 2 | ||||
| -rw-r--r-- | tests/auto/qxmlstream/tst_qxmlstream.cpp | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/tests/auto/qxmlstream/qxmlstream.pro b/tests/auto/qxmlstream/qxmlstream.pro index 8f076be..31331cf 100644 --- a/tests/auto/qxmlstream/qxmlstream.pro +++ b/tests/auto/qxmlstream/qxmlstream.pro @@ -8,7 +8,7 @@ wince*|symbian: { addFiles.sources = data XML-Test-Suite addFiles.path = . DEPLOYMENT += addFiles - DEFINES += SRCDIR=\\\"\\\" + wince*:DEFINES += SRCDIR=\\\"\\\" } else { DEFINES += SRCDIR=\\\"$$PWD/\\\" } diff --git a/tests/auto/qxmlstream/tst_qxmlstream.cpp b/tests/auto/qxmlstream/tst_qxmlstream.cpp index 7d5e3b7..19e4b90 100644 --- a/tests/auto/qxmlstream/tst_qxmlstream.cpp +++ b/tests/auto/qxmlstream/tst_qxmlstream.cpp @@ -55,6 +55,10 @@ //TESTED_CLASS=QXmlStreamReader QXmlStreamWriter //TESTED_FILES=corelib/xml/stream/qxmlutils.cpp corelib/xml/stream/qxmlstream.cpp corelib/xml/stream/qxmlstream_p.h +#ifdef Q_OS_SYMBIAN +#define SRCDIR "" +#endif + Q_DECLARE_METATYPE(QXmlStreamReader::ReadElementTextBehaviour) static const char *const catalogFile = SRCDIR "XML-Test-Suite/xmlconf/finalCatalog.xml"; |