diff options
| -rw-r--r-- | tests/auto/qabstractxmlnodemodel/tst_qabstractxmlnodemodel.cpp | 2 | ||||
| -rw-r--r-- | tests/auto/qxmlquery/tst_qxmlquery.cpp | 10 |
2 files changed, 10 insertions, 2 deletions
diff --git a/tests/auto/qabstractxmlnodemodel/tst_qabstractxmlnodemodel.cpp b/tests/auto/qabstractxmlnodemodel/tst_qabstractxmlnodemodel.cpp index 3c8a2ec9..3d2369d7 100644 --- a/tests/auto/qabstractxmlnodemodel/tst_qabstractxmlnodemodel.cpp +++ b/tests/auto/qabstractxmlnodemodel/tst_qabstractxmlnodemodel.cpp @@ -183,7 +183,7 @@ void tst_QAbstractXmlNodeModel::nextFromSimpleAxis() { QXmlQuery openDoc(m_namePool); const QString testFilePath = QDir::currentPath() + QLatin1Char('/') + QLatin1String(testFileName); - openDoc.bindVariable(QLatin1String("docURI"), QVariant(testFilePath)); + openDoc.bindVariable(QLatin1String("docURI"), QVariant(QUrl::fromLocalFile(testFilePath))); openDoc.setQuery(QLatin1String("doc($docURI)")); QXmlResultItems doc; QVERIFY(openDoc.isValid()); diff --git a/tests/auto/qxmlquery/tst_qxmlquery.cpp b/tests/auto/qxmlquery/tst_qxmlquery.cpp index 27f3964a..372bcdbe 100644 --- a/tests/auto/qxmlquery/tst_qxmlquery.cpp +++ b/tests/auto/qxmlquery/tst_qxmlquery.cpp @@ -2875,7 +2875,15 @@ void tst_QXmlQuery::useUriResolver() const const QUrl &baseURI) const { Q_UNUSED(relative); - return baseURI.resolved(inputFile(QLatin1String(queriesDirectory) + QLatin1String("simpleDocument.xml"))); + QString fixedInputFile = inputFile(QLatin1String(queriesDirectory) + QLatin1String("simpleDocument.xml")); +#ifdef Q_OS_WIN + // A file path with drive letter is not a valid relative URI, so remove the drive letter. + // Note that can't just use inputFileAsURI() instead of inputFile() as that doesn't + // produce a relative URI either. + if (fixedInputFile.size() > 1 && fixedInputFile.at(1) == QLatin1Char(':')) + fixedInputFile.remove(0, 2); +#endif + return baseURI.resolved(fixedInputFile); } }; |