diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-02-15 03:05:25 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-02-15 03:05:25 +0100 |
| commit | 006230f02f28c5131b45d7f80b2bda1502090781 (patch) | |
| tree | ebb6af843642f6a1e0cf38b73c9415507e35748f | |
| parent | f6d4d9848673086e08956f5af280dfc15afec1d9 (diff) | |
| parent | d55e4ca379d21addce1c110f4d1e080009fd4de1 (diff) | |
Merge remote-tracking branch 'origin/5.14' into 5.15
Change-Id: I74af38bad73f3d4b1ab2132916ef61f30618af02
| -rw-r--r-- | doc/src/legal/licensechanges.qdoc | 6 | ||||
| -rw-r--r-- | doc/src/platforms/windows.qdoc | 6 | ||||
| -rw-r--r-- | doc/src/qmlapp/debugging.qdoc | 4 |
3 files changed, 10 insertions, 6 deletions
diff --git a/doc/src/legal/licensechanges.qdoc b/doc/src/legal/licensechanges.qdoc index 6276ee0ef..2780bce2f 100644 --- a/doc/src/legal/licensechanges.qdoc +++ b/doc/src/legal/licensechanges.qdoc @@ -34,6 +34,12 @@ Changes in Qt and \l{Licenses Used in Qt}{Third Party Modules} released with Qt that are relevant to licensing. + \section1 Qt 5.14.2 + + \section2 Qt SQL Module + + \l{sqlite}{SQLite} got updated to upstream version 3.31.1. + \section1 Qt 5.14.1 \section2 Qt Core Module diff --git a/doc/src/platforms/windows.qdoc b/doc/src/platforms/windows.qdoc index 1f9003e05..f4153c423 100644 --- a/doc/src/platforms/windows.qdoc +++ b/doc/src/platforms/windows.qdoc @@ -517,12 +517,6 @@ This page contains information about \l{Qt for Windows}. - \section1 Library Naming - - The \c configure option -qtlibinfix cannot take a version number as an argument. - For example: - \c{-qtlibinfix 5.6.0} should be specified as \c{-qtlibinfix QtCore5.6.dll}. - \section1 Installation location Installing Qt into a directory with spaces, for example, diff --git a/doc/src/qmlapp/debugging.qdoc b/doc/src/qmlapp/debugging.qdoc index 404a5db32..c44fe5e14 100644 --- a/doc/src/qmlapp/debugging.qdoc +++ b/doc/src/qmlapp/debugging.qdoc @@ -176,6 +176,10 @@ QQmlImportDatabase::resolveType "Rectangle" = "QDeclarativeRectangle" The \l{Qt QML} module provides services for debugging, inspecting, and profiling applications via a TCP port or a local socket. +\note The \c qmltooling plugins that are required for debugging and profiling +QML applications on devices are automatically installed during Qt installation. +They must be deployed to the devices for debugging and profiling to work. + \section2 Enabling the Infrastructure When you compile your application, you must explicitly enable the debugging infrastructure. If you |