diff options
-rw-r--r-- | .qmake.conf | 2 | ||||
-rw-r--r-- | doc/src/legal/licensechanges.qdoc | 15 | ||||
-rw-r--r-- | doc/src/platforms/android/android-building.qdoc | 4 | ||||
-rw-r--r-- | doc/src/platforms/android/android-platform-notes.qdoc | 9 | ||||
-rw-r--r-- | doc/src/platforms/android/android.qdoc | 17 | ||||
-rw-r--r-- | doc/src/platforms/linux.qdoc | 34 |
6 files changed, 59 insertions, 22 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-building.qdoc b/doc/src/platforms/android/android-building.qdoc index 942753cc9..36bdf6379 100644 --- a/doc/src/platforms/android/android-building.qdoc +++ b/doc/src/platforms/android/android-building.qdoc @@ -120,7 +120,7 @@ mkdir <path_to_build_dir>/build-qt cd <path_to_build_dir>/build-qt - <path_to_qt_source>/configure -xplatform android-clang -prefix </path/to/install> -disable-rpath -nomake tests -nomake examples -android-ndk <path/to/sdk>/ndk/<ndk_version> -android-sdk <path/to/sdk> -no-warnings-are-errors + <path_to_qt_source>/configure -xplatform android-clang -prefix </path/to/install> -android-ndk <path/to/sdk>/ndk/<ndk_version> -android-sdk <path/to/sdk> \endcode \l{Qt Configure Options} contains more information about the configure options. @@ -217,7 +217,7 @@ mkdir C:\Qt\Build\build-qt cd C:\Qt\Build\build-qt - ..\Src_%VERSION%\configure.bat -platform win32-g++ -xplatform android-clang -prefix <\path\to\install> -nomake tests -nomake examples -android-sdk <ANDROID_SDK_PATH> -android-ndk <ANDROID_SDK_PATH>\ndk\<ndk_version> -android-ndk-host windows-x86_64 -no-warnings-are-errors + ..\Src_%VERSION%\configure.bat -platform win32-g++ -xplatform android-clang -prefix <\path\to\install> -android-sdk <ANDROID_SDK_PATH> -android-ndk <ANDROID_SDK_PATH>\ndk\<ndk_version> -android-ndk-host windows-x86_64 \endcode \l{Qt Configure Options} contains more information about the configure options. 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 diff --git a/doc/src/platforms/android/android.qdoc b/doc/src/platforms/android/android.qdoc index e5e4ffd28..2c1fb4def 100644 --- a/doc/src/platforms/android/android.qdoc +++ b/doc/src/platforms/android/android.qdoc @@ -146,16 +146,16 @@ Different Qt versions depend on different NDK versions, as listed below: Qt 5.13.2 or later Qt 5.12.6 or later \li NDK r20b or r21 - \li \e android-clang + \li android-clang \row \li Qt 5.12.0 to 5.12.5 Qt 5.13.0 to 5.13.1 \li NDK r19c - \li \e android-clang + \li android-clang \row \li Qt 5.11 and earlier \li NDK r10e - \li \e GCC toolchain + \li GCC toolchain \endtable \note Qt 5.14.0 and 5.14.1 with NDK r21 have a bug fixed at \l {QTBUG-81461}. @@ -203,21 +203,20 @@ After the package installation is complete, install the driver from \l{Android: adb}{adb} commands now and check whether your Android device responds to them. -\section2 Linux 64-bit +\section2 Linux -If you're developing on a 64-bit Linux machine, you must install the -following dependencies in order to run 32-bit executables like \c adb, which -allows Qt Creator to find devices to deploy to: +The following dependencies are needed for using tools such as \c adb or \c gdb which +can be used by Qt Creator: \badcode -sudo apt-get install libstdc++6:i386 libgcc1:i386 zlib1g:i386 libncurses5:i386 +sudo apt-get install libstdc++6 libncurses5 \endcode \target emulator dependencies To run the Android emulator, the following dependencies are also necessary: \badcode -sudo apt-get install libsdl1.2debian:i386 +sudo apt-get install libsdl1.2debian \endcode \section2 Qt Creator IDE diff --git a/doc/src/platforms/linux.qdoc b/doc/src/platforms/linux.qdoc index 4a8e38f9e..c1a675da7 100644 --- a/doc/src/platforms/linux.qdoc +++ b/doc/src/platforms/linux.qdoc @@ -149,43 +149,49 @@ \li libxcb-render \li X C Bindings for Render extension \li auto-detected - \li 1.9 + \li 1.11 \row {id="OptionalColor"} \li xcb-render-util \li libxcb-render-util \li Utility library for XCB for Render extension \li auto-detected - \li 0.3.8 + \li 0.3.9 \row {id="OptionalColor"} \li xcb-shape \li libxcb-shape \li X C Bindings for Shape extension \li auto-detected - \li 1.9 + \li 1.11 \row {id="DefaultColor"} \li xcb-randr \li libxcb-randr \li X C Bindings for Resize and Rotate Extension \li auto-detected - \li 1.9 + \li 1.11 \row {id="DefaultColor"} \li xcb-xfixes \li libxcb-xfixes \li X C Bindings for Fixes Extension \li auto-detected - \li 1.9 + \li 1.11 + \row {id="DefaultColor"} + \li xcb-xkb + \li libxcb-xkb + \li X C Bindings for XKeyboard Extension + \li auto-detected + \li 1.11 \row {id="DefaultColor"} \li xcb-sync \li libxcb-sync \li X C Bindings for Sync Extension \li auto-detected - \li 1.9 + \li 1.11 \row {id="DefaultColor"} \li xcb-shm \li libxcb-shm \li X C Bindings for Shared Memory Extension \li auto-detected - \li 1.9 + \li 1.11 \row {id="DefaultColor"} \li xcb-icccm \li libxcb-icccm @@ -204,6 +210,12 @@ \li Utility library for XCB for XImage and XShmImage, used for QBackingStore and cursor support \li auto-detected \li 0.3.9 + \row {id="DefaultColor"} + \li xcb-util + \li libxcb-util + \li Utility library for XCB for atom, aux and event + \li auto-detected + \li 0.3.9 \row {id="OptionalColor"} \li xkbcommon @@ -247,7 +259,7 @@ \li libxcb \li X C Binding library \li - \li 1.9 + \li 1.11 \row {id="DefaultColor"} \li X11-xcb \li libX11-xcb @@ -302,12 +314,14 @@ \li libxcb-image0-dev \li libxcb-shm0-dev \li libxcb-icccm4-dev - \li libxcb-sync0-dev + \li libxcb-sync-dev \li libxcb-xfixes0-dev \li libxcb-shape0-dev \li libxcb-randr0-dev \li libxcb-render-util0-dev - \li libxcd-xinerama-dev + \li libxcb-util-dev + \li libxcb-xinerama0-dev + \li libxcb-xkb-dev \li libxkbcommon-dev \li libxkbcommon-x11-dev \endlist |