From d0ca6784282fea4cff47784e6ed5e36887187af4 Mon Sep 17 00:00:00 2001
From: Leena Miettinen <riitta-leena.miettinen@qt.io>
Date: Thu, 2 May 2019 14:15:57 +0200
Subject: [PATCH] Doc: Fix QDoc warnings
Change-Id: I00ec352cdea43d44388889805f1bd609a3555c4c
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
---
.../recipebrowser/doc/src/recipebrowser.qdoc | 20 ++++++++++++-------
.../api/qwebengineclientcertificatestore.cpp | 7 -------
.../api/qwebengineprofile.cpp | 4 ++--
3 files changed, 15 insertions(+), 16 deletions(-)
diff --git a/examples/webengine/recipebrowser/doc/src/recipebrowser.qdoc b/examples/webengine/recipebrowser/doc/src/recipebrowser.qdoc
index 0321c22e4..63a0af361 100644
--- a/examples/webengine/recipebrowser/doc/src/recipebrowser.qdoc
+++ b/examples/webengine/recipebrowser/doc/src/recipebrowser.qdoc
@@ -101,7 +101,7 @@
width.
\skipto WebEngineView
- \printuntil KeyNavigation.priority
+ \printuntil Layout.fillHeight
We then disable the \l{WebEngineSettings::focusOnNavigationEnabled}{focusOnNavigationEnabled}
setting to make sure that the \l{WebEngineView} does not steal focus from the \c RecipeList
@@ -110,19 +110,25 @@
ContextMenuRequest.
\skipto focusOnNavigationEnabled
- \printto firstLoadComplete
+ \printuntil }
When the application starts, instead of directly showing the \l{WebEngineView}, we show a
placeholder \l{Rectangle} with a \l{BusyIndicator} to provide a nicer user experience while the
- application is loading. Once the first page in the view is loaded, we start a \l{Timer} that
+ application is loading.
+
+ \printuntil }
+ \dots 12
+ \skipto Rectangle
+ \printuntil }
+
+ Once the first page in the view is loaded, we start a \l{Timer} that
will hide the placeholder and show the actual page. The delay provides more time for the recipe
images to load, so that when the view is shown, the page is completely rendered. The timer also
shows a help \l{ToolTip} that informs the user on how to navigate the recipes.
- \printuntil busy.running = true
- \printline }
- \printline }
- \printline }
+ \quotefromfile webengine/recipebrowser/resources/qml/main.qml
+ \skipto Timer {
+ \printuntil }
Let's see what the \c RecipeList item looks like from the inside. The root item is a
FocusScope to allow transferring focus to the child ListView whenever the root item receives
diff --git a/src/core/api/qwebengineclientcertificatestore.cpp b/src/core/api/qwebengineclientcertificatestore.cpp
index 854628b29..0c059bcca 100644
--- a/src/core/api/qwebengineclientcertificatestore.cpp
+++ b/src/core/api/qwebengineclientcertificatestore.cpp
@@ -48,13 +48,6 @@ QT_BEGIN_NAMESPACE
#if QT_CONFIG(ssl)
-/*!
- \class QWebEngineClientCertificateStore::Entry
- \inmodule QtWebEngineCore
- \since 5.13
- \brief This structure holds the certificate and the private key.
-*/
-
/*!
\class QWebEngineClientCertificateStore
\inmodule QtWebEngineCore
diff --git a/src/webenginewidgets/api/qwebengineprofile.cpp b/src/webenginewidgets/api/qwebengineprofile.cpp
index 6b31b3217..237d68473 100644
--- a/src/webenginewidgets/api/qwebengineprofile.cpp
+++ b/src/webenginewidgets/api/qwebengineprofile.cpp
@@ -834,8 +834,8 @@ void QWebEngineProfile::removeAllUrlSchemeHandlers()
Currently only affects Linux/NSS installations where it enables OCSP.
- As long as one profile has this option enabled, all other profiles will be
- able to use it for their certificate verification.
+ As long as one profile has \a enabled set to \c true, all other profiles
+ will be able to use it for their certificate verification.
\sa isUsedForGlobalCertificateVerification(), httpCacheType()
*/
--
GitLab