diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-10-30 10:38:24 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-10-30 10:38:24 +0100 |
| commit | 62dbc6b4a1608bf75c00b90b6da60785c2e8fc89 (patch) | |
| tree | e87acdb89d4f099871650feb6d338d231f0721fc | |
| parent | 58b25da3163ce78eb2748768cbae80f5fe3d1397 (diff) | |
| parent | bf9557850ede7e49d1546ac6180acecf8786f87f (diff) | |
| download | qtdoc-62dbc6b4a1608bf75c00b90b6da60785c2e8fc89.tar.gz | |
Merge remote-tracking branch 'origin/5.13.2' into 5.13
Change-Id: I5e4eb7b097ccdb074bfc64e2a0d37000364c3342
| -rw-r--r-- | .qmake.conf | 2 | ||||
| -rw-r--r-- | dist/changes-5.13.2 | 20 | ||||
| -rw-r--r-- | doc/src/legal/licensechanges.qdoc | 9 |
3 files changed, 29 insertions, 2 deletions
diff --git a/.qmake.conf b/.qmake.conf index 1ed62c5a..543d0a84 100644 --- a/.qmake.conf +++ b/.qmake.conf @@ -1,3 +1,3 @@ load(qt_build_config) -MODULE_VERSION = 5.13.1 +MODULE_VERSION = 5.13.2 diff --git a/dist/changes-5.13.2 b/dist/changes-5.13.2 new file mode 100644 index 00000000..e3bb833f --- /dev/null +++ b/dist/changes-5.13.2 @@ -0,0 +1,20 @@ +Qt 5.13.2 is a bug-fix release. It maintains both forward and backward +compatibility (source and binary) with Qt 5.13.0 through 5.13.1. + +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/doc/src/legal/licensechanges.qdoc b/doc/src/legal/licensechanges.qdoc index 11475d1b..d27e2936 100644 --- a/doc/src/legal/licensechanges.qdoc +++ b/doc/src/legal/licensechanges.qdoc @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2018 The Qt Company Ltd. +** Copyright (C) 2019 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the documentation of the Qt Toolkit. @@ -36,6 +36,13 @@ \section1 Qt 5.13.2 + \section2 Qt GUI Module + + \list + \li \l{X Server helper} was added under X11 License and Historical Permission Notice and Disclaimer license. + \li \l{Adobe Glyph List For New Fonts} version 1.7 was added under BSD 3-Clause \"New\" or \"Revised\" License. + \endlist + \section2 Qt SQL Module \l{SQLite} got updated to upstream version 3.29.0. |