summaryrefslogtreecommitdiff
path: root/src/core
diff options
context:
space:
mode:
Diffstat (limited to 'src/core')
-rw-r--r--src/core/api/qwebenginenewwindowrequest.cpp2
-rw-r--r--src/core/api/qwebenginepage.cpp4
-rw-r--r--src/core/doc/snippets/qtwebenginecore_build_snippet.qdoc5
-rw-r--r--src/core/doc/src/qtwebenginecore-index.qdoc5
-rw-r--r--src/core/doc/src/qtwebenginecore-module.qdoc12
5 files changed, 23 insertions, 5 deletions
diff --git a/src/core/api/qwebenginenewwindowrequest.cpp b/src/core/api/qwebenginenewwindowrequest.cpp
index 1322bb4dd..9fc025c0e 100644
--- a/src/core/api/qwebenginenewwindowrequest.cpp
+++ b/src/core/api/qwebenginenewwindowrequest.cpp
@@ -60,7 +60,7 @@ QT_BEGIN_NAMESPACE
/*!
\qmltype WebEngineNewViewRequest
- \instantiates QQuickWebEngineNewViewRequest
+ \instantiates QWebEngineNewWindowRequest
\inqmlmodule QtWebEngineQuick
\since QtWebEngine 1.1
diff --git a/src/core/api/qwebenginepage.cpp b/src/core/api/qwebenginepage.cpp
index 17e138920..f2c903638 100644
--- a/src/core/api/qwebenginepage.cpp
+++ b/src/core/api/qwebenginepage.cpp
@@ -2275,7 +2275,7 @@ QSizeF QWebEnginePage::contentsSize() const
Renders the current content of the page into a PDF document and saves it
in the location specified in \a filePath.
The page size and orientation of the produced PDF document are taken from
- the values specified in \a pageLayout, while the range of pages printed is
+ the values specified in \a layout, while the range of pages printed is
taken from \a ranges with the default being printing all pages.
This method issues an asynchronous request for printing the web page into
@@ -2302,7 +2302,7 @@ void QWebEnginePage::printToPdf(const QString &filePath, const QPageLayout &layo
/*!
Renders the current content of the page into a PDF document and returns a byte array containing the PDF data
as parameter to \a resultCallback.
- The page size and orientation of the produced PDF document are taken from the values specified in \a pageLayout,
+ The page size and orientation of the produced PDF document are taken from the values specified in \a layout,
while the range of pages printed is taken from \a ranges with the default being printing all pages.
The \a resultCallback must take a const reference to a QByteArray as parameter. If printing was successful, this byte array
diff --git a/src/core/doc/snippets/qtwebenginecore_build_snippet.qdoc b/src/core/doc/snippets/qtwebenginecore_build_snippet.qdoc
index 94e26c9c5..43421bafb 100644
--- a/src/core/doc/snippets/qtwebenginecore_build_snippet.qdoc
+++ b/src/core/doc/snippets/qtwebenginecore_build_snippet.qdoc
@@ -33,3 +33,8 @@ QT += webenginecore
//! [1]
#include <QtWebEngineCore>
//! [1]
+
+//! [2]
+find_package(Qt6 COMPONENTS WebEngineCore REQUIRED)
+target_link_libraries(target PRIVATE Qt::WebEngineCore)
+//! [2]
diff --git a/src/core/doc/src/qtwebenginecore-index.qdoc b/src/core/doc/src/qtwebenginecore-index.qdoc
index 692e33d1d..0fdde2257 100644
--- a/src/core/doc/src/qtwebenginecore-index.qdoc
+++ b/src/core/doc/src/qtwebenginecore-index.qdoc
@@ -44,6 +44,11 @@
\snippet qtwebenginecore_build_snippet.qdoc 0
+ For build with CMake use the \c find_package() command to locate the needed module components
+ in the Qt6 package and \c target_link_libraries() to link against the module:
+
+ \snippet qtwebenginecore_build_snippet.qdoc 2
+
\section1 Articles and Guides
\list
diff --git a/src/core/doc/src/qtwebenginecore-module.qdoc b/src/core/doc/src/qtwebenginecore-module.qdoc
index c976d024c..033d81116 100644
--- a/src/core/doc/src/qtwebenginecore-module.qdoc
+++ b/src/core/doc/src/qtwebenginecore-module.qdoc
@@ -33,6 +33,8 @@
\since 5.6
\ingroup qtwebengine-modules
\ingroup modules
+ \qtvariable webenginecore
+ \qtcmakepackage WebEngineCore
To include the definitions of the module's classes, use the
following directive:
@@ -44,10 +46,16 @@
\l{Qt WebEngine Widgets C++ Classes}{Qt WebEngine Widgets} modules.
\if !defined(qtforpython)
- To link against the module, add this line to your qmake project file:
+ To link against the module using build with qmake,
+ add this line to your qmake project file:
\snippet qtwebenginecore_build_snippet.qdoc 0
- However, \c webenginecore is implied by adding \c webengine or \c webenginewidgets.
+ However, \c webenginecore is implied by adding \c webenginequick or \c webenginewidgets.
+
+ For build with CMake use the \c find_package() command to locate the needed module components
+ in the Qt6 package and \c target_link_libraries() to link against the module:
+
+ \snippet qtwebenginecore_build_snippet.qdoc 2
\endif
*/