diff options
| author | Tarja Sundqvist <tarja.sundqvist@qt.io> | 2022-08-16 20:38:04 +0300 |
|---|---|---|
| committer | Tarja Sundqvist <tarja.sundqvist@qt.io> | 2022-08-16 20:38:04 +0300 |
| commit | 87577dde04ed219bda776dabca86176149736331 (patch) | |
| tree | 4e7c6d1acd69092b182c09f1a8fc0b7d1419b142 | |
| parent | 429096eb954672d3727a3e8cc83832bc79cf7967 (diff) | |
| parent | 16d784a411f26446dd020c4d15e7d0cf9e271db4 (diff) | |
Merge remote-tracking branch 'origin/tqtc/lts-5.15.6' into tqtc/lts-5.15-opensourcev5.15.6-lts-lgpl
Change-Id: I7208a764c866adee24c0a669d94cb80fc6469eec
| -rw-r--r-- | .qmake.conf | 2 | ||||
| -rw-r--r-- | src/webview/doc/src/qtwebview-overview.qdoc | 6 |
2 files changed, 5 insertions, 3 deletions
diff --git a/.qmake.conf b/.qmake.conf index 7596096..d7075cd 100644 --- a/.qmake.conf +++ b/.qmake.conf @@ -2,4 +2,4 @@ load(qt_build_config) DEFINES += QT_NO_FOREACH -MODULE_VERSION = 5.15.5 +MODULE_VERSION = 5.15.6 diff --git a/src/webview/doc/src/qtwebview-overview.qdoc b/src/webview/doc/src/qtwebview-overview.qdoc index 0c2330b..dc59f3c 100644 --- a/src/webview/doc/src/qtwebview-overview.qdoc +++ b/src/webview/doc/src/qtwebview-overview.qdoc @@ -40,8 +40,10 @@ on iOS, where policy dictates that all web content is displayed using the operating system's web view. - On Windows, Linux, and \macos, Qt \WebView depends on the \l{Qt WebEngine} - module to render content. + On Windows and Linux, Qt \WebView depends on the \l{Qt WebEngine} module to render + content. + + On \macos, the system web view is used in the same manner as iOS. \section1 Prerequisites |