diff options
| author | Prasanth Ullattil <prasanth.ullattil@nokia.com> | 2010-01-12 13:53:30 (GMT) |
|---|---|---|
| committer | Prasanth Ullattil <prasanth.ullattil@nokia.com> | 2010-01-12 13:53:30 (GMT) |
| commit | 5a4a0af70184888fa05769bae2d22ee39d905bc0 (patch) | |
| tree | 582132a0a14e18b770e2dbcd115b5e76c81e5884 | |
| parent | c90c5b6124bb952500c1d3ca0114163729414771 (diff) | |
| download | Qt-5a4a0af70184888fa05769bae2d22ee39d905bc0.zip Qt-5a4a0af70184888fa05769bae2d22ee39d905bc0.tar.gz Qt-5a4a0af70184888fa05769bae2d22ee39d905bc0.tar.bz2 | |
Revert "Fixed qxmlstream autotest when using shadow builds."
This reverts commit f8780558e3fc68321a0dd6dcef611eeee0805a2e.
| -rw-r--r-- | tests/auto/qxmlstream/qxmlstream.pro | 4 | ||||
| -rw-r--r-- | tests/auto/qxmlstream/tst_qxmlstream.cpp | 6 |
2 files changed, 3 insertions, 7 deletions
diff --git a/tests/auto/qxmlstream/qxmlstream.pro b/tests/auto/qxmlstream/qxmlstream.pro index 89d7bc1..ac03d42 100644 --- a/tests/auto/qxmlstream/qxmlstream.pro +++ b/tests/auto/qxmlstream/qxmlstream.pro @@ -8,8 +8,4 @@ wince*|symbian*: { addFiles.sources = data XML-Test-Suite addFiles.path = . DEPLOYMENT += addFiles - DEFINES += SRCDIR=\\\"\\\" -} else { - DEFINES += SRCDIR=\\\"$$PWD/\\\" } - diff --git a/tests/auto/qxmlstream/tst_qxmlstream.cpp b/tests/auto/qxmlstream/tst_qxmlstream.cpp index 6aa9955..27ae089 100644 --- a/tests/auto/qxmlstream/tst_qxmlstream.cpp +++ b/tests/auto/qxmlstream/tst_qxmlstream.cpp @@ -57,7 +57,7 @@ Q_DECLARE_METATYPE(QXmlStreamReader::ReadElementTextBehaviour) -static const char *const catalogFile = SRCDIR "XML-Test-Suite/xmlconf/finalCatalog.xml"; +static const char *const catalogFile = "XML-Test-Suite/xmlconf/finalCatalog.xml"; static const int expectedRunCount = 1646; static const int expectedSkipCount = 532; @@ -804,7 +804,7 @@ void tst_QXmlStream::testReader_data() const QTest::addColumn<QString>("xml"); QTest::addColumn<QString>("ref"); QDir dir; - dir.cd(SRCDIR "data/"); + dir.cd("data/"); foreach(QString filename , dir.entryList(QStringList() << "*.xml")) { QString reference = QFileInfo(filename).baseName() + ".ref"; QTest::newRow(dir.filePath(filename).toLatin1().data()) << dir.filePath(filename) << dir.filePath(reference); @@ -1183,7 +1183,7 @@ void tst_QXmlStream::crashInUTF16Codec() const QEventLoop eventLoop; QNetworkAccessManager networkManager; - QNetworkRequest request(QUrl::fromLocalFile(QLatin1String(SRCDIR "data/051reduced.xml"))); + QNetworkRequest request(QUrl::fromLocalFile(QLatin1String("data/051reduced.xml"))); QNetworkReply *const reply = networkManager.get(request); eventLoop.connect(reply, SIGNAL(finished()), SLOT(quit())); |