diff options
Diffstat (limited to 'tests/auto/shared')
| -rw-r--r-- | tests/auto/shared/testhttpserver.cpp | 7 | ||||
| -rw-r--r-- | tests/auto/shared/util.h | 7 |
2 files changed, 10 insertions, 4 deletions
diff --git a/tests/auto/shared/testhttpserver.cpp b/tests/auto/shared/testhttpserver.cpp index 09f16e8635..f0d5a89984 100644 --- a/tests/auto/shared/testhttpserver.cpp +++ b/tests/auto/shared/testhttpserver.cpp @@ -32,6 +32,7 @@ #include <QFile> #include <QTimer> #include <QTest> +#include <QQmlFile> /*! \internal @@ -152,17 +153,17 @@ bool TestHTTPServer::wait(const QUrl &expect, const QUrl &reply, const QUrl &bod m_state = AwaitingHeader; m_data.clear(); - QFile expectFile(expect.toLocalFile()); + QFile expectFile(QQmlFile::urlToLocalFileOrQrc(expect)); if (!expectFile.open(QIODevice::ReadOnly)) return false; - QFile replyFile(reply.toLocalFile()); + QFile replyFile(QQmlFile::urlToLocalFileOrQrc(reply)); if (!replyFile.open(QIODevice::ReadOnly)) return false; m_bodyData = QByteArray(); if (body.isValid()) { - QFile bodyFile(body.toLocalFile()); + QFile bodyFile(QQmlFile::urlToLocalFileOrQrc(body)); if (!bodyFile.open(QIODevice::ReadOnly)) return false; m_bodyData = bodyFile.readAll(); diff --git a/tests/auto/shared/util.h b/tests/auto/shared/util.h index 6f3f0a06a8..2088258378 100644 --- a/tests/auto/shared/util.h +++ b/tests/auto/shared/util.h @@ -48,7 +48,12 @@ public: inline QString testFile(const char *fileName) const { return testFile(QLatin1String(fileName)); } inline QUrl testFileUrl(const QString &fileName) const - { return QUrl::fromLocalFile(testFile(fileName)); } + { + const QString fn = testFile(fileName); + return fn.startsWith(QLatin1Char(':')) + ? QUrl(QLatin1String("qrc") + fn) + : QUrl::fromLocalFile(fn); + } inline QUrl testFileUrl(const char *fileName) const { return testFileUrl(QLatin1String(fileName)); } |