diff options
| author | Tarja Sundqvist <tarja.sundqvist@qt.io> | 2025-06-04 09:23:45 +0300 |
|---|---|---|
| committer | Tarja Sundqvist <tarja.sundqvist@qt.io> | 2025-06-04 09:23:45 +0300 |
| commit | 94c09aab1dac228a9ddf03abd7d76559b5d6af16 (patch) | |
| tree | 9a02c6407dded2f74b6790f8686c4ab7c8777b21 /src/core/doc | |
| parent | f08b503f680e8a6d4021d2fd21d2386f8e60da24 (diff) | |
| parent | 0efae85f199a61fd6919703cfbb74d680d9a9443 (diff) | |
Merge tag 'v6.5.6-lts' into 6.5.66.5.6
Qt 6.5.6-lts release
Conflicts solved:
dependencies.yaml
Change-Id: I31ed402989d58b5195459a8a3bf309e6354c35f6
Diffstat (limited to 'src/core/doc')
| -rw-r--r-- | src/core/doc/src/qwebenginepage_lgpl.qdoc | 1 | ||||
| -rw-r--r-- | src/core/doc/src/qwebenginesettings_lgpl.qdoc | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/core/doc/src/qwebenginepage_lgpl.qdoc b/src/core/doc/src/qwebenginepage_lgpl.qdoc index 8f8f50968..a8a31da11 100644 --- a/src/core/doc/src/qwebenginepage_lgpl.qdoc +++ b/src/core/doc/src/qwebenginepage_lgpl.qdoc @@ -710,6 +710,7 @@ is empty, it is assumed that the content is \c{text/plain,charset=US-ASCII}. External objects referenced in the content are located relative to \a baseUrl. + For external objects with relative URLs to be loaded, \c baseUrl cannot be empty. The \a data is loaded immediately; external objects are loaded asynchronously. diff --git a/src/core/doc/src/qwebenginesettings_lgpl.qdoc b/src/core/doc/src/qwebenginesettings_lgpl.qdoc index 63e9c9710..d98cef8c9 100644 --- a/src/core/doc/src/qwebenginesettings_lgpl.qdoc +++ b/src/core/doc/src/qwebenginesettings_lgpl.qdoc @@ -15,8 +15,8 @@ \inmodule QtWebEngineCore QWebEngineSettings allows configuration of browser properties, such as font sizes and - families, the location of a custom style sheet, and generic attributes, such as JavaScript - support. Individual attributes are set using the setAttribute() function. The + families, and generic attributes, such as JavaScript support. + Individual attributes are set using the setAttribute() function. The \l{QWebEngineSettings::WebAttribute}{WebAttribute} enum further describes each attribute. Each QWebEnginePage object has its own QWebEngineSettings object, which configures the |