From 04e770cfbafa16c09dd527897bfac2a457b47644 Mon Sep 17 00:00:00 2001 From: Antti Kokko Date: Tue, 30 Jul 2019 11:25:43 +0300 Subject: Add changes file for Qt 5.13.1 + 25a313cc7af41c2c63231499c49cc1f3e382e019 Allow union memberTypes as members of a SimpleType in a XSDSchema + a8e463058edec8882bf5eb1ae1ba87cefdb8ba8c Bump version + 4efc4b1d0c11b68e1140734f659b22ce266d1bd6 Add changes file for Qt 5.12.4 + 78c788c386ccb69d823d71f668cfae45eef56351 Android: Disable tests that depend on external files + 47c86cbb55a03df0f9d95dc2311b0be6d7852a5b Actually test XmlListModel + adf91ef5da6bb51288fffd68d3c9ebb02c3fe9bf Fix GCC 9 -Wdeprecated-copy + 0e1ee397fe97d06b946e6fa296378721496ba3e5 Bump version + 1fe82f967320b3c65f29ed704862f8c34a6c0c87 Bump version + 5e6e09823da454e16341b9cab944b74a13265ef9 Doc: Replace example file lists with links to code.qt.io Change-Id: Ic21afc08f0fe1fe77dd5d0225e2d780b66b82d32 Reviewed-by: Jani Heikkinen --- dist/changes-5.13.1 | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 dist/changes-5.13.1 diff --git a/dist/changes-5.13.1 b/dist/changes-5.13.1 new file mode 100644 index 00000000..57ebdbeb --- /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. -- cgit v1.2.3 From cdf3aa96879b7f5f0bd9bec9d1bd8dd624beee28 Mon Sep 17 00:00:00 2001 From: Antti Kokko Date: Tue, 20 Aug 2019 13:16:26 +0300 Subject: Add changes file for Qt 5.12.5 + 47c86cbb55a03df0f9d95dc2311b0be6d7852a5b Actually test XmlListModel + adf91ef5da6bb51288fffd68d3c9ebb02c3fe9bf Fix GCC 9 -Wdeprecated-copy + 1fe82f967320b3c65f29ed704862f8c34a6c0c87 Bump version Change-Id: I4faaef9a8e7c4b44f73e2a27ce028e2112aa5a29 Reviewed-by: Marc Mutz --- dist/changes-5.12.5 | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 dist/changes-5.12.5 diff --git a/dist/changes-5.12.5 b/dist/changes-5.12.5 new file mode 100644 index 00000000..e8be9316 --- /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. -- cgit v1.2.3 From af8b508de56fee70d6f3c971254fcb848805d18f Mon Sep 17 00:00:00 2001 From: Edward Welbourne Date: Fri, 20 Sep 2019 10:46:42 +0200 Subject: Make a test conditional on its set-up having succeeded tst_QXmlQuery::setQueryQUrlFailure()'s sub-test "Query via file:/ that does not have read permissions." depends on the file it tries to read being unreadable. The test's set-up contained a comment explaining why we don't QVERIFY() that it succeeded, but went ahead with adding the test-case regardless. Oddly enough, when the set-up fails to deny permissions, the test fails because the file can be read, so isn't found invalid. Made addition of the test-case conditional on the set-up having succeeded. This made a long line over-long; and it included a duplicated long slab of boring code, used in another test, so extract that piece of code as a lambda and use it twice to save duplication. The tests were also passing raw C-strings to QUrl(), which wants a QString, so give it QStringLiteral() in one case and the existing QString with the relevant name in the other. Fixes: QTBUG-78560 Change-Id: I2e9ca6fe526edfc021cb4978c81fc9204e047c7f Reviewed-by: Volker Hilsheimer --- tests/auto/qxmlquery/tst_qxmlquery.cpp | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/tests/auto/qxmlquery/tst_qxmlquery.cpp b/tests/auto/qxmlquery/tst_qxmlquery.cpp index 09d38168..d1b125bd 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("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) -- cgit v1.2.3