Merge remote-tracking branch 'origin/5.13' into 5.14

 Conflicts:
	.qmake.conf
	doc/src/platforms/android-platform-notes.qdoc

Change-Id: I2cc9f09464368a28879d5d755d1079d5f461edb5

5 files changed, 42 insertions, 2 deletions

diff --git a/dist/changes-5.13.2 b/dist/changes-5.13.2
new file mode 100644
index 000000000..e3bb833f0
--- /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 b04fd0175..44a1aefa4 100644
--- a/doc/src/legal/licensechanges.qdoc
+++ b/doc/src/legal/licensechanges.qdoc
@@ -71,6 +71,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}{SQLite} got updated to upstream version 3.29.0.
diff --git a/doc/src/platforms/android-building.qdoc b/doc/src/platforms/android-building.qdoc
index aeff44bee..de1f6684b 100644
--- a/doc/src/platforms/android-building.qdoc
+++ b/doc/src/platforms/android-building.qdoc
@@ -177,11 +177,11 @@
             set "ANDROID_BUILD_TOOLS_REVISION=21.1.2"
             set "ANDROID_NDK_PATH=<ANDROID_NDK_PATH>"
             set "ANDROID_TOOLCHAIN_VERSION=4.9"
-            \encode
+            \endcode
             Depending on which NDK you have downloaded, add its path:
             \code
             set "ANDROID_NDK_HOST=windows-x86_64"
-            \encdode
+            \endcode
             or
             \code
             set "ANDROID_NDK_HOST=windows"
diff --git a/doc/src/platforms/android-platform-notes.qdoc b/doc/src/platforms/android-platform-notes.qdoc
index f27bef48f..ee3e237b9 100644
--- a/doc/src/platforms/android-platform-notes.qdoc
+++ b/doc/src/platforms/android-platform-notes.qdoc
@@ -149,4 +149,13 @@
     % make aab
     \endcode
 
+    \section1 Known Issues
+
+    Due to a bug on some devices, when you turn off predictive text with \c ImhNoPredictiveText,
+    this property will be ignored and predictive text will still be enabled. To work around this,
+    set the \c QT_ANDROID_ENABLE_WORKAROUND_TO_DISABLE_PREDICTIVE_TEXT environment variable to \c 1.
+    However, one side effect is that this environment variable can cause a problem with other
+    keyboards such as Gboard. If you use a language like Japanese, with Gboard, only a QWERTY
+    keyboard is displayed. This environment variable is queried each time the keyboard is displayed,
+    so it's possible to toggle the workaround on and off, as necessary.
 */
diff --git a/doc/src/platforms/android.qdoc b/doc/src/platforms/android.qdoc
index 54b2b15cc..0f107017f 100644
--- a/doc/src/platforms/android.qdoc
+++ b/doc/src/platforms/android.qdoc
@@ -168,6 +168,10 @@ earlier. For more details, refer to the
 \l{https://developer.android.com/studio/intro/update.html}{Android Studio}
 documentation.
 
+\note Make sure to unpack the Android SDK and NDK to a writeable location that Qt Creator
+can access later. Otherwise, Qt Creator won't be able to use \c sdkmanager or find all
+components even if they were installed manually.
+
 \section2 Updating the Android SDK
 
 The command line tools provided by the Android SDK Tools package also enables updating