diff options
| author | Tarja Sundqvist <tarja.sundqvist@qt.io> | 2024-05-08 08:17:36 +0300 |
|---|---|---|
| committer | Tarja Sundqvist <tarja.sundqvist@qt.io> | 2024-05-08 08:17:36 +0300 |
| commit | 8073519e5d25306255721ee55f636428061e3d08 (patch) | |
| tree | 92b4aaf7a9a1a45fbb2bf356e461b307057114d1 | |
| parent | b685bfe5ce621c2b4ceaead020f7f123a00ae230 (diff) | |
| parent | c32703b2bcf93ec3f263897a020fdd8b55614ea9 (diff) | |
Merge remote-tracking branch 'origin/tqtc/lts-5.15.14' into tqtc/lts-5.15-opensourcev5.15.14-lts-lgpl
Change-Id: I196b1cc7509c7540eb8d5f513c5a5eaee35b22a6
| -rw-r--r-- | .qmake.conf | 2 | ||||
| -rw-r--r-- | doc/src/legal/licensechanges.qdoc | 15 | ||||
| -rw-r--r-- | doc/src/platforms/android/android-platform-notes.qdoc | 9 |
3 files changed, 25 insertions, 1 deletions
diff --git a/.qmake.conf b/.qmake.conf index 3880db6dc..5adcfcf20 100644 --- a/.qmake.conf +++ b/.qmake.conf @@ -1,3 +1,3 @@ load(qt_build_config) -MODULE_VERSION = 5.15.13 +MODULE_VERSION = 5.15.14 diff --git a/doc/src/legal/licensechanges.qdoc b/doc/src/legal/licensechanges.qdoc index 56dd9b063..2e6f37889 100644 --- a/doc/src/legal/licensechanges.qdoc +++ b/doc/src/legal/licensechanges.qdoc @@ -34,6 +34,21 @@ Changes in Qt and \l{Licenses Used in Qt}{Third Party Modules} released with Qt that are relevant to licensing. + \section1 Qt 5.15.14 + + \section2 Qt Core Module + + The copy of the \l{psl}{Public Suffix List} was updated to the version + published on 2023-05-03. + + \section2 Qt GUI Module + + \l{freetype}{Freetype 2} was updated to upstream version 2.13.0. + + \section2 Qt SQL Module + + \l{sqlite}{SQLite} was updated to upstream version 3.41.1. + \section1 Qt 5.15.13 \section2 Qt Core Module diff --git a/doc/src/platforms/android/android-platform-notes.qdoc b/doc/src/platforms/android/android-platform-notes.qdoc index 6dc339fff..8080c738e 100644 --- a/doc/src/platforms/android/android-platform-notes.qdoc +++ b/doc/src/platforms/android/android-platform-notes.qdoc @@ -57,6 +57,15 @@ must be listed in the application's dependencies. For more information, see \l{Dependencies Detection}. + \section1 Qt Gui Dependency + + Given that Android apps typically include GUI elements, the Qt for Android plugin + is built mainly to provide a GUI, so it implements the various QPA abstractions. + As a result, deploying a Qt for Android app is expected to involve a dependency + on \l {Qt Gui}. Moreover, it's worth noting that Qt Creator only supports Gradle builds + and deployments, meaning that command line or shell executions are not supported + out of the box. + \section1 Text Special Considerations Because of a bug in some OpenGL drivers, the mechanism used by Qt to cache |