diff options
| author | Janne Anttila <janne.anttila@digia.com> | 2009-08-11 07:45:19 (GMT) |
|---|---|---|
| committer | Janne Anttila <janne.anttila@digia.com> | 2009-08-11 07:45:19 (GMT) |
| commit | de1dc0a9893fb4afe31ccc60c12cafa19546349d (patch) | |
| tree | d5cf2f01d6715a95c9703a54b17e13136bd01a1e | |
| parent | a329c91a197c90854cbc6ce2a626935ff1d57680 (diff) | |
| parent | 7ae19c4358a4cd7907569c12a2d3c4784257808e (diff) | |
| download | Qt-de1dc0a9893fb4afe31ccc60c12cafa19546349d.zip Qt-de1dc0a9893fb4afe31ccc60c12cafa19546349d.tar.gz Qt-de1dc0a9893fb4afe31ccc60c12cafa19546349d.tar.bz2 | |
Merge branch 'master' of git@scm.dev.troll.no:qt/qt-s60-public
| -rw-r--r-- | tests/auto/qxmlquery/qxmlquery.pro | 8 | ||||
| -rw-r--r-- | tests/auto/qxmlquery/tst_qxmlquery.cpp | 4 |
2 files changed, 8 insertions, 4 deletions
diff --git a/tests/auto/qxmlquery/qxmlquery.pro b/tests/auto/qxmlquery/qxmlquery.pro index 92700c5..cfab564 100644 --- a/tests/auto/qxmlquery/qxmlquery.pro +++ b/tests/auto/qxmlquery/qxmlquery.pro @@ -10,10 +10,10 @@ RESOURCES = input.qrc QT += network -!wince* { -DEFINES += SRCDIR=\\\"$$PWD/\\\" -} else { -DEFINES += SRCDIR=\\\"./\\\" +wince* { + DEFINES += SRCDIR=\\\"./\\\" +} else:!symbian { + DEFINES += SRCDIR=\\\"$$PWD/\\\" } include (../xmlpatterns.pri) diff --git a/tests/auto/qxmlquery/tst_qxmlquery.cpp b/tests/auto/qxmlquery/tst_qxmlquery.cpp index 32e1e16..b563e06 100644 --- a/tests/auto/qxmlquery/tst_qxmlquery.cpp +++ b/tests/auto/qxmlquery/tst_qxmlquery.cpp @@ -65,6 +65,10 @@ #include "TestFundament.h" #include "../network-settings.h" +#if defined(Q_OS_SYMBIAN) +#define SRCDIR "" +#endif + /*! \class tst_QXmlQuery \internal |