diff options
-rw-r--r-- | dist/changes-5.12.5 | 20 | ||||
-rw-r--r-- | dist/changes-5.13.1 | 20 | ||||
-rw-r--r-- | tests/auto/qxmlquery/tst_qxmlquery.cpp | 13 |
3 files changed, 48 insertions, 5 deletions
diff --git a/dist/changes-5.12.5 b/dist/changes-5.12.5 new file mode 100644 index 0000000..e8be931 --- /dev/null +++ b/dist/changes-5.12.5 @@ -0,0 +1,20 @@ +Qt 5.12.5 is a bug-fix release. It maintains both forward and backward +compatibility (source and binary) with Qt 5.12.0 through 5.12.4. + +For more details, refer to the online documentation included in this +distribution. The documentation is also available online: + +https://doc.qt.io/qt-5/index.html + +The Qt version 5.12 series is binary compatible with the 5.11.x series. +Applications compiled for 5.11 will continue to run with 5.12. + +Some of the changes listed in this file include issue tracking numbers +corresponding to tasks in the Qt Bug Tracker: + +https://bugreports.qt.io/ + +Each of these identifiers can be entered in the bug tracker to obtain more +information about a particular change. + + - This release contains only minor code improvements. diff --git a/dist/changes-5.13.1 b/dist/changes-5.13.1 new file mode 100644 index 0000000..57ebdbe --- /dev/null +++ b/dist/changes-5.13.1 @@ -0,0 +1,20 @@ +Qt 5.13.1 is a bug-fix release. It maintains both forward and backward +compatibility (source and binary) with Qt 5.13.0. + +For more details, refer to the online documentation included in this +distribution. The documentation is also available online: + +https://doc.qt.io/qt-5/index.html + +The Qt version 5.13 series is binary compatible with the 5.12.x series. +Applications compiled for 5.12 will continue to run with 5.13. + +Some of the changes listed in this file include issue tracking numbers +corresponding to tasks in the Qt Bug Tracker: + +https://bugreports.qt.io/ + +Each of these identifiers can be entered in the bug tracker to obtain more +information about a particular change. + + - This release contains only minor code improvements. diff --git a/tests/auto/qxmlquery/tst_qxmlquery.cpp b/tests/auto/qxmlquery/tst_qxmlquery.cpp index 09d3816..d1b125b 100644 --- a/tests/auto/qxmlquery/tst_qxmlquery.cpp +++ b/tests/auto/qxmlquery/tst_qxmlquery.cpp @@ -2595,13 +2595,16 @@ void tst_QXmlQuery::setQueryQUrlFailure() const void tst_QXmlQuery::setQueryQUrlFailure_data() const { + const auto localFileUrl = [](const QString &relPath) { + return QUrl::fromLocalFile(QCoreApplication::applicationFilePath()).resolved(QUrl(relPath)); + }; QTest::addColumn<QUrl>("queryURI"); QTest::newRow("Query via file:// that does not exist.") << QUrl::fromEncoded("file://example.com/does/not/exist"); QTest::newRow("A query via file:// that is completely empty, but readable.") - << QUrl::fromLocalFile(QCoreApplication::applicationFilePath()).resolved(QUrl("../xmlpatterns/queries/completelyEmptyQuery.xq")); + << localFileUrl(QStringLiteral("../xmlpatterns/queries/completelyEmptyQuery.xq")); { const QString name(QLatin1String("nonReadableFile.xq")); @@ -2610,10 +2613,10 @@ void tst_QXmlQuery::setQueryQUrlFailure_data() const outFile.write(QByteArray("1")); outFile.close(); /* On some windows versions, this fails, so we don't check that this works with QVERIFY. */ - outFile.setPermissions(QFile::Permissions(QFile::Permissions())); - - QTest::newRow("Query via file:/ that does not have read permissions.") - << QUrl::fromLocalFile(QCoreApplication::applicationFilePath()).resolved(QUrl("nonReadableFile.xq")); + if (outFile.setPermissions(QFile::Permissions())) { + QTest::newRow("Query via file:/ that does not have read permissions.") + << localFileUrl(name); + } } if(!m_testNetwork) |