summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichal Klocek <michal.klocek@qt.io>2023-01-02 15:44:41 +0100
committerMichal Klocek <michal.klocek@qt.io>2023-01-06 19:05:24 +0100
commitdf4fee6fd3045884aee483c34c76c6718a10fe56 (patch)
treeb3bfe622d44ad092dc9dcd7629103d8e105900b7
parent8e0c3ce2f7abcf999d4be9071f3ed2a692db0f71 (diff)
downloadqtwebengine-df4fee6fd3045884aee483c34c76c6718a10fe56.tar.gz
Fix qdoc link failures
Pick-to: 6.5 6.4 Change-Id: I6b18382a376bf3067323e801f6f39bf4ec09e9dc Reviewed-by: Michael BrĂ¼ning <michael.bruning@qt.io>
-rw-r--r--examples/webenginewidgets/clientcertificate/doc/src/clientcertificate.qdoc6
-rw-r--r--src/core/api/qwebenginenewwindowrequest.cpp2
-rw-r--r--src/core/doc/src/qtwebengine-features.qdoc2
-rw-r--r--src/core/doc/src/qtwebenginecore-index.qdoc3
-rw-r--r--src/webenginequick/doc/src/webenginescript.qdoc2
5 files changed, 8 insertions, 7 deletions
diff --git a/examples/webenginewidgets/clientcertificate/doc/src/clientcertificate.qdoc b/examples/webenginewidgets/clientcertificate/doc/src/clientcertificate.qdoc
index b2b67b2e2..108d2db7b 100644
--- a/examples/webenginewidgets/clientcertificate/doc/src/clientcertificate.qdoc
+++ b/examples/webenginewidgets/clientcertificate/doc/src/clientcertificate.qdoc
@@ -84,7 +84,7 @@
\skipto QFile
\printuntil QSslKey
- Now we add the certificate and its private key to \l {QWebEngigneCretificateStore}.
+ Now we add the certificate and its private key to \l {QWebEngigneClientCertificateStore}.
\printuntil clientCertificateStore
@@ -99,7 +99,7 @@
\printuntil acceptCertificate
The handling for \l QWebEnginePage::selectClientCertificate simply displays \l QDialog
- with \l QWidgetList showing a list of client certificates to choose from.
+ with \l QListWidget showing a list of client certificates to choose from.
The user selected certificate is then passed to the
\l QWebEngineClientCertificateSelection::select call.
@@ -115,7 +115,7 @@
For our embedded device we will develop a minimalistic HTTPS server. We can use \l QSslServer
to handle incoming connections and to provide an \l QSslSocket instance. To do that,
we create an instance of a \l QSslServer and, similarly to our client setup, we load a server
- certificate and its private key. Next, we create \l QSslCertifcate and \l QSslKey objects
+ certificate and its private key. Next, we create \l QSslCertificate and \l QSslKey objects
accordingly. Additionally, we need a CA certificate so the server can validate the certificate
presented by the client. The CA and local certificate are set to \l QSslConfiguration and
used later by the server.
diff --git a/src/core/api/qwebenginenewwindowrequest.cpp b/src/core/api/qwebenginenewwindowrequest.cpp
index 951753136..895033fd1 100644
--- a/src/core/api/qwebenginenewwindowrequest.cpp
+++ b/src/core/api/qwebenginenewwindowrequest.cpp
@@ -25,7 +25,7 @@ QT_BEGIN_NAMESPACE
/*!
\qmltype WebEngineNewWindowRequest
\instantiates QWebEngineNewWindowRequest
- \inqmlmodule QtWebEngineQuick
+ \inqmlmodule QtWebEngine
\since QtWebEngine 1.12
\brief A utility type for the WebEngineView::newWindowRequested signal.
diff --git a/src/core/doc/src/qtwebengine-features.qdoc b/src/core/doc/src/qtwebengine-features.qdoc
index 6588a9d5f..a564641a5 100644
--- a/src/core/doc/src/qtwebengine-features.qdoc
+++ b/src/core/doc/src/qtwebengine-features.qdoc
@@ -166,7 +166,7 @@
\section1 Favicon
\QWE supports the web site URL icon, \e favicon. Each icon is stored in the internal
- database for each \l QWebEngieProfile and can be accessed using a \l QWebEnginePage::icon()
+ database for each \l QWebEngineProfile and can be accessed using a \l QWebEnginePage::icon()
call or a \l {WebEngineView::icon}{WebEngineView.icon} property for the currently loaded content.
Moreover \QWE provides API for accessing already stored icons in the internal profile's database.
diff --git a/src/core/doc/src/qtwebenginecore-index.qdoc b/src/core/doc/src/qtwebenginecore-index.qdoc
index cd6f2efe4..e6fc0b307 100644
--- a/src/core/doc/src/qtwebenginecore-index.qdoc
+++ b/src/core/doc/src/qtwebenginecore-index.qdoc
@@ -7,7 +7,8 @@
\brief Provides common API shared by \QWE Quick and \QWE Widgets.
- \QWE Core provides API shared by \l {Qt WebEngine Quick} and \l {Qt WebEngine Widgets}.
+ \QWE Core provides API shared by \l {Qt WebEngine QML Types}{Qt WebEngine Quick} and
+ \l {Qt WebEngine Widgets C++ Classes}{Qt WebEngine Widgets}.
\section1 Getting Started
diff --git a/src/webenginequick/doc/src/webenginescript.qdoc b/src/webenginequick/doc/src/webenginescript.qdoc
index 5919b29e3..9708ffbf8 100644
--- a/src/webenginequick/doc/src/webenginescript.qdoc
+++ b/src/webenginequick/doc/src/webenginescript.qdoc
@@ -32,7 +32,7 @@
\l{WebEngineScriptCollection::find}{WebEngineScriptCollection.find} method.
*/
-*!
+/*!
\qmlproperty url WebEngineScript::sourceUrl
This property holds the remote source location of the user script (if any).