diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2021-06-22 15:16:16 +0200 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2021-06-24 01:24:45 +0000 |
| commit | 866245f4eb9c570a4a01abcbac927a0665bada13 (patch) | |
| tree | f0284d9807446f7fbb915d781acf055a44ef3425 | |
| parent | f81571f1af5efae6f7e2d8c7ce790b65eb606b47 (diff) | |
Fix module specified for moved classes
Change-Id: Iad93680dd0811086c481d9bf8adb298f663bdfa4
Reviewed-by: Michal Klocek <michal.klocek@qt.io>
(cherry picked from commit 0bcd8a6b8f96b214892fb296c6d6655ade43136f)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| -rw-r--r-- | src/core/api/qwebengineclientcertificateselection.cpp | 2 | ||||
| -rw-r--r-- | src/core/api/qwebengineprofile.cpp | 2 | ||||
| -rw-r--r-- | src/core/doc/snippets/qtwebengine_qwebenginepage_snippet.cpp (renamed from src/webenginewidgets/doc/snippets/qtwebengine_qwebenginepage_snippet.cpp) | 0 | ||||
| -rw-r--r-- | src/core/doc/src/qwebenginepage_lgpl.qdoc (renamed from src/webenginewidgets/doc/src/qwebenginepage_lgpl.qdoc) | 16 |
4 files changed, 3 insertions, 17 deletions
diff --git a/src/core/api/qwebengineclientcertificateselection.cpp b/src/core/api/qwebengineclientcertificateselection.cpp index febfe0a21..7df5cb57a 100644 --- a/src/core/api/qwebengineclientcertificateselection.cpp +++ b/src/core/api/qwebengineclientcertificateselection.cpp @@ -46,7 +46,7 @@ QT_BEGIN_NAMESPACE \class QWebEngineClientCertificateSelection \brief The QWebEngineClientCertSelection class wraps a client certificate selection. \since 5.12 - \inmodule QtWebEngineWidgets + \inmodule QtWebEngineCore When a web site requests an SSL client certificate, and one or more certificates are found in the system's client certificate store, this class provides access to diff --git a/src/core/api/qwebengineprofile.cpp b/src/core/api/qwebengineprofile.cpp index d319356df..29edc3afb 100644 --- a/src/core/api/qwebengineprofile.cpp +++ b/src/core/api/qwebengineprofile.cpp @@ -68,7 +68,7 @@ using QtWebEngineCore::ProfileAdapter; \brief The QWebEngineProfile class provides a web engine profile shared by multiple pages. \since 5.5 - \inmodule QtWebEngineWidgets + \inmodule QtWebEngineCore A web engine profile contains settings, scripts, persistent cookie policy, and the list of visited links shared by all web engine pages that belong to the profile. diff --git a/src/webenginewidgets/doc/snippets/qtwebengine_qwebenginepage_snippet.cpp b/src/core/doc/snippets/qtwebengine_qwebenginepage_snippet.cpp index b948fa597..b948fa597 100644 --- a/src/webenginewidgets/doc/snippets/qtwebengine_qwebenginepage_snippet.cpp +++ b/src/core/doc/snippets/qtwebengine_qwebenginepage_snippet.cpp diff --git a/src/webenginewidgets/doc/src/qwebenginepage_lgpl.qdoc b/src/core/doc/src/qwebenginepage_lgpl.qdoc index bbd3d886e..8fddb5ebd 100644 --- a/src/webenginewidgets/doc/src/qwebenginepage_lgpl.qdoc +++ b/src/core/doc/src/qwebenginepage_lgpl.qdoc @@ -28,7 +28,7 @@ \class QWebEnginePage \brief The QWebEnginePage class provides an object to view and edit web documents. \since 5.4 - \inmodule QtWebEngineWidgets + \inmodule QtWebEngineCore A \e {web engine page} holds the contents of an HTML document, the history of navigated links, and actions. @@ -329,20 +329,6 @@ */ /*! - \fn void QWebEnginePage::setView(QWidget* view) - Sets the \a view that is associated with the web page. - - \sa view() -*/ - -/*! - \fn QWidget *QWebEnginePage::view() const - Returns the view widget that is associated with the web page. - - \sa setView() -*/ - -/*! \fn QMenu *QWebEnginePage::createStandardContextMenu() Creates the standard context menu which is shown when the user clicks on the web page with the right mouse button. It is |