diff options
author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-06-22 03:01:46 +0200 |
---|---|---|
committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-06-22 03:01:46 +0200 |
commit | 357deebd7ae3005ca02ea1818ffae64c1440bc51 (patch) | |
tree | bff1fec34a98cd4c7c9b5734f16f516384352205 | |
parent | fc214a5d298e9d916882528c43e78e386ff8b0ad (diff) | |
parent | 14f92341e5a3293a718557d728a2c0bec1b1ac9a (diff) | |
download | qtxmlpatterns-357deebd7ae3005ca02ea1818ffae64c1440bc51.tar.gz |
Merge "Merge remote-tracking branch 'origin/5.13' into dev"
-rw-r--r-- | dist/changes-5.13.0 | 18 | ||||
-rw-r--r-- | tests/auto/auto.pro | 8 |
2 files changed, 26 insertions, 0 deletions
diff --git a/dist/changes-5.13.0 b/dist/changes-5.13.0 new file mode 100644 index 0000000..ebb4be1 --- /dev/null +++ b/dist/changes-5.13.0 @@ -0,0 +1,18 @@ +Qt 5.13 introduces many new features and improvements as well as bugfixes +over the 5.12.x series. 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/auto.pro b/tests/auto/auto.pro index 40f4c5c..dfec856 100644 --- a/tests/auto/auto.pro +++ b/tests/auto/auto.pro @@ -57,3 +57,11 @@ qtHaveModule(quick): SUBIDIRS += qquickxmllistmodel !cross_compile: SUBDIRS += host.pro +# these tests depend on auxiliary files to be deployed so they +# fail on Android. Given the state of the module, we simply +# disable them - the code is already tested on regular Linux. +android: SUBDIRS-= checkxmlfiles \ + patternistexamples \ + qabstractxmlnodemodel \ + qxmlquery + |