Commit 4dd21d0e authored by Frederik Gladhorn's avatar Frederik Gladhorn
Browse files

Merge 5.14 into 5.14.0

Change-Id: I836deb4998a582c5bce34cfd18214ea6887e4bce
parents 8a67496a 9b34f4d9
Branches
Tags
No related merge requests found
Showing with 61 additions and 82 deletions
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.
...@@ -9,73 +9,8 @@ version = $QT_VERSION ...@@ -9,73 +9,8 @@ version = $QT_VERSION
# Instruct Clang not to look for a module header # Instruct Clang not to look for a module header
moduleheader = moduleheader =
depends += \ # Depend on everything - load all available index files
activeqt \ depends = *
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
headerdirs += ../src headerdirs += ../src
imagedirs += ../src/images \ imagedirs += ../src/images \
......
...@@ -183,12 +183,12 @@ ...@@ -183,12 +183,12 @@
thread. thread.
Each WorkerScript instance can have one \c{.js} script attached to it. When 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 called, the script will run in a separate thread (and a separate
\l{QQmlContext}{QML context}). When the script finishes running, it can \l{QQmlContext}{QML context}). When the script finishes running, it can
send a reply back to the GUI thread which will invoke the send a reply back to the GUI thread which will invoke the
\l {QtQml::WorkerScript::message()}{WorkerScript.onMessage}() signal \l {QtQml.WorkerScript::WorkerScript::message()}{WorkerScript.onMessage}()
handler. signal handler.
Using a WorkerScript is similar to using a worker QObject that has been moved Using a WorkerScript is similar to using a worker QObject that has been moved
to another thread. Data is transferred between threads via signals. to another thread. Data is transferred between threads via signals.
...@@ -309,10 +309,11 @@ ...@@ -309,10 +309,11 @@
when the results are ready. when the results are ready.
\li Place the computation code in a \c{.js} script and attach it to a \li Place the computation code in a \c{.js} script and attach it to a
WorkerScript instance. Call WorkerScript instance. Call
\l{QtQml::WorkerScript::sendMessage()}{WorkerScript.sendMessage}() \l{QtQml.WorkerScript::WorkerScript::sendMessage()}
to start the computation in a new thread. Let the script call {WorkerScript.sendMessage}() to start the computation in a new
sendMessage() too, to pass the result back to the GUI thread. thread. Let the script call sendMessage() too, to pass the result
Handle the result in \c onMessage and update the GUI there. back to the GUI thread. Handle the result in \c onMessage and
update the GUI there.
\row \row
\li Permanent \li Permanent
\li Have an object living in another thread that can perform different \li Have an object living in another thread that can perform different
......
...@@ -71,6 +71,13 @@ ...@@ -71,6 +71,13 @@
\section1 Qt 5.13.2 \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 \section2 Qt SQL Module
\l{sqlite}{SQLite} got updated to upstream version 3.29.0. \l{sqlite}{SQLite} got updated to upstream version 3.29.0.
......
...@@ -83,7 +83,7 @@ ...@@ -83,7 +83,7 @@
\endlist \endlist
\section2 Building Qt \section2 Building Qt for Android on Linux
\list 1 \list 1
\li If you have a commercially licensed Qt, install your license file. If you're using \li If you have a commercially licensed Qt, install your license file. If you're using
...@@ -156,6 +156,8 @@ ...@@ -156,6 +156,8 @@
\li Install the latest JDK from \li Install the latest JDK from
\l{https://www.oracle.com/technetwork/java/javase/downloads/index.html}. Then, add the \l{https://www.oracle.com/technetwork/java/javase/downloads/index.html}. Then, add the
\e{<JDK_ROOT>} to \c PATH. \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 \li Install the Android NDK, r18b, from
\l{https://developer.android.com/tools/sdk/ndk/index.html}. Extract it to \l{https://developer.android.com/tools/sdk/ndk/index.html}. Extract it to
\e{<ANDROID_NDK_PATH>}. \e{<ANDROID_NDK_PATH>}.
...@@ -177,18 +179,18 @@ ...@@ -177,18 +179,18 @@
set "ANDROID_BUILD_TOOLS_REVISION=21.1.2" set "ANDROID_BUILD_TOOLS_REVISION=21.1.2"
set "ANDROID_NDK_PATH=<ANDROID_NDK_PATH>" set "ANDROID_NDK_PATH=<ANDROID_NDK_PATH>"
set "ANDROID_TOOLCHAIN_VERSION=4.9" set "ANDROID_TOOLCHAIN_VERSION=4.9"
\encode \endcode
Depending on which NDK you have downloaded, add its path: Depending on which NDK you have downloaded, add its path:
\code \code
set "ANDROID_NDK_HOST=windows-x86_64" set "ANDROID_NDK_HOST=windows-x86_64"
\encdode \endcode
or or
\code \code
set "ANDROID_NDK_HOST=windows" set "ANDROID_NDK_HOST=windows"
\endcode \endcode
\endlist \endlist
\section2 Building Qt \section2 Building Qt for Android on Windows
\list \list
\li If you have a commercially licensed Qt, install your license file. If you're using \li If you have a commercially licensed Qt, install your license file. If you're using
...@@ -203,13 +205,12 @@ ...@@ -203,13 +205,12 @@
installed, for example: \c{C:\Qt\%VERSION%}. This install path must not contain any installed, for example: \c{C:\Qt\%VERSION%}. This install path must not contain any
spaces or Windows-specific file system characters. spaces or Windows-specific file system characters.
\li Run the following command. \e{<N>} is optional, representing the number of parallel \li Run the following command to configure Qt:
jobs your system can do.
\code \code
configure.bat -prefix <path to install Qt to> -platform win32-g++ -opengl es2 -xplatform 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 android-clang -android-ndk %ANDROID_NDK_PATH% -android-sdk %ANDROID_SDK_ROOT% -nomake tests
-nomake examples mingw32-make.exe -j<N> -nomake examples
\endcode \endcode
\li To build the previously configured parts of Qt, run the following command: \li To build the previously configured parts of Qt, run the following command:
...@@ -218,6 +219,8 @@ ...@@ -218,6 +219,8 @@
mingw32-make.exe -j<N> mingw32-make.exe -j<N>
\endcode \endcode
\e{<N>} is optional, representing the number of parallel jobs your system can do.
\li Now, to install Qt, run the following command: \li Now, to install Qt, run the following command:
\code \code
......
...@@ -149,4 +149,13 @@ ...@@ -149,4 +149,13 @@
% make aab % make aab
\endcode \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.
*/ */
...@@ -168,6 +168,10 @@ earlier. For more details, refer to the ...@@ -168,6 +168,10 @@ earlier. For more details, refer to the
\l{https://developer.android.com/studio/intro/update.html}{Android Studio} \l{https://developer.android.com/studio/intro/update.html}{Android Studio}
documentation. 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 \section2 Updating the Android SDK
The command line tools provided by the Android SDK Tools package also enables updating The command line tools provided by the Android SDK Tools package also enables updating
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment