Merge 5.14 into 5.14.0

Change-Id: I836deb4998a582c5bce34cfd18214ea6887e4bce

7 files changed, 61 insertions, 82 deletions

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/config/qtdoc.qdocconf b/doc/config/qtdoc.qdocconf
index f2edc47c..2447be4e 100644
--- a/doc/config/qtdoc.qdocconf
+++ b/doc/config/qtdoc.qdocconf
@@ -9,73 +9,8 @@ version                 = $QT_VERSION
 # Instruct Clang not to look for a module header
 moduleheader =
 
-depends += \
-    activeqt \
-    qtcmake \
-    qdoc \
-    qmake \
-    qtandroidextras \
-    qtassistant \
-    qtbluetooth \
-    qtconcurrent \
-    qtcore \
-    qtdbus \
-    qtdesigner \
-    qtgamepad \
-    qtgraphicaleffects \
-    qthelp \
-    qtimageformats \
-    qtgui \
-    qtlinguist \
-    qtlocation \
-    qtlottieanimation \
-    qtmacextras \
-    qtmultimedia \
-    qtnetwork \
-    qtnfc \
-    qtopengl \
-    qtplatformheaders \
-    qtpositioning \
-    qtprintsupport \
-    qtqml \
-    qtqmlmodels \
-    qtqmltest \
-    qtquick \
-    qtquickcontrols \
-    qtquickdialogs \
-    qtquickextras \
-    qtquicktimeline \
-    qtscript \
-    qtscripttools \
-    qtscxml \
-    qtsensors \
-    qtserialbus \
-    qtserialport \
-    qtsql \
-    qtsvg \
-    qttestlib \
-    qtuitools \
-    qtwebchannel \
-    qtwebengine \
-    qtwebsockets \
-    qtwidgets \
-    qtwinextras \
-    qtx11extras \
-    qtxml \
-    qtxmlpatterns \
-    qt3d \
-    qtwebview \
-    qtquickcontrols1 \
-    qtwaylandcompositor \
-    qtcharts \
-    qtdatavisualization \
-    qtpurchasing \
-    qtvirtualkeyboard \
-    qtspeech \
-    qtnetworkauth \
-    qtremoteobjects \
-    qtdistancefieldgenerator \
-    qtquick3d
+# Depend on everything - load all available index files
+depends = *
 
 headerdirs  += ../src
 imagedirs   += ../src/images \
diff --git a/doc/src/frameworks-technologies/threads.qdoc b/doc/src/frameworks-technologies/threads.qdoc
index 2ba3e03c..b5291f4f 100644
--- a/doc/src/frameworks-technologies/threads.qdoc
+++ b/doc/src/frameworks-technologies/threads.qdoc
@@ -183,12 +183,12 @@
     thread.
 
     Each WorkerScript instance can have one \c{.js} script attached to it. When
-    \l {QtQml::WorkerScript::sendMessage()}{WorkerScript.sendMessage}() is
+    \l {QtQml.WorkerScript::WorkerScript::sendMessage()}{WorkerScript.sendMessage}() is
     called, the script will run in a separate thread (and a separate
     \l{QQmlContext}{QML context}). When the script finishes running, it can
     send a reply back to the GUI thread which will invoke the
-    \l {QtQml::WorkerScript::message()}{WorkerScript.onMessage}() signal
-    handler.
+    \l {QtQml.WorkerScript::WorkerScript::message()}{WorkerScript.onMessage}()
+    signal handler.
 
     Using a WorkerScript is similar to using a worker QObject that has been moved
     to another thread. Data is transferred between threads via signals.
@@ -309,10 +309,11 @@
             when the results are ready.
         \li Place the computation code in a \c{.js} script and attach it to a
             WorkerScript instance. Call
-            \l{QtQml::WorkerScript::sendMessage()}{WorkerScript.sendMessage}()
-            to start the computation in a new thread. Let the script call
-            sendMessage() too, to pass the result back to the GUI thread.
-            Handle the result in \c onMessage and update the GUI there.
+            \l{QtQml.WorkerScript::WorkerScript::sendMessage()}
+            {WorkerScript.sendMessage}() to start the computation in a new
+            thread. Let the script call sendMessage() too, to pass the result
+            back to the GUI thread. Handle the result in \c onMessage and
+            update the GUI there.
     \row
         \li Permanent
         \li Have an object living in another thread that can perform different
diff --git a/doc/src/legal/licensechanges.qdoc b/doc/src/legal/licensechanges.qdoc
index b04fd017..44a1aefa 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 aeff44be..3180dbc2 100644
--- a/doc/src/platforms/android-building.qdoc
+++ b/doc/src/platforms/android-building.qdoc
@@ -83,7 +83,7 @@
     \endlist
 
 
-    \section2 Building Qt
+    \section2 Building Qt for Android on Linux
 
     \list 1
         \li If you have a commercially licensed Qt, install your license file. If you're using
@@ -156,6 +156,8 @@
         \li Install the latest JDK from
             \l{https://www.oracle.com/technetwork/java/javase/downloads/index.html}. Then, add the
             \e{<JDK_ROOT>} to \c PATH.
+            Alternatively, if you've installed Android Studio, you can use the JDK that's
+            included in your installation's \c jre folder.
         \li Install the Android NDK, r18b, from
             \l{https://developer.android.com/tools/sdk/ndk/index.html}. Extract it to
             \e{<ANDROID_NDK_PATH>}.
@@ -177,18 +179,18 @@
             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"
             \endcode
     \endlist
 
-    \section2 Building Qt
+    \section2 Building Qt for Android on Windows
 
     \list
         \li If you have a commercially licensed Qt, install your license file. If you're using
@@ -203,13 +205,12 @@
             installed, for example: \c{C:\Qt\%VERSION%}. This install path must not contain any
             spaces or Windows-specific file system characters.
 
-        \li Run the following command. \e{<N>} is optional, representing the number of parallel
-            jobs your system can do.
+        \li Run the following command to configure Qt:
 
         \code
         configure.bat -prefix <path to install Qt to> -platform win32-g++ -opengl es2 -xplatform
-        android-g++ -android-ndk ANDROID_NDK_PATH -android-sdk ANDROID_SDK_ROOT -nomake tests
-        -nomake examples mingw32-make.exe -j<N>
+        android-clang -android-ndk %ANDROID_NDK_PATH% -android-sdk %ANDROID_SDK_ROOT% -nomake tests
+        -nomake examples
         \endcode
 
         \li To build the previously configured parts of Qt, run the following command:
@@ -218,6 +219,8 @@
         mingw32-make.exe -j<N>
         \endcode
 
+        \e{<N>} is optional, representing the number of parallel jobs your system can do.
+
         \li Now, to install Qt, run the following command:
 
         \code
diff --git a/doc/src/platforms/android-platform-notes.qdoc b/doc/src/platforms/android-platform-notes.qdoc
index f27bef48..ee3e237b 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 54b2b15c..0f107017 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