Merge remote-tracking branch 'origin/wip/qtpdf' into 5.15v5.15.0-beta1

The feature set is mostly in place (except for some known shortcomings)
and we need the merge to build it on iOS.

Task-number: QTBUG-69519
Change-Id: Ib1ac82a9a7e0830d98d1c4327a1b15d4d7f4d4c1

4 files changed, 55 insertions, 2 deletions

diff --git a/src/pdf/doc/qtpdf.qdocconf b/src/pdf/doc/qtpdf.qdocconf
index b55b25327..7a77105c9 100644
--- a/src/pdf/doc/qtpdf.qdocconf
+++ b/src/pdf/doc/qtpdf.qdocconf
@@ -37,7 +37,10 @@ depends += qtcore \
            qtwidgets \
            qtgui \
            qtdoc \
-           qmake
+           qmake \
+           qtdesigner \
+           qtquick \
+           qtcmake
 
 headerdirs  += ../api \
                ../quick
diff --git a/src/pdf/doc/snippets/qtpdf-build.cmake b/src/pdf/doc/snippets/qtpdf-build.cmake
new file mode 100644
index 000000000..d46b9c3ee
--- /dev/null
+++ b/src/pdf/doc/snippets/qtpdf-build.cmake
@@ -0,0 +1,2 @@
+find_package(Qt5 COMPONENTS Pdf REQUIRED)
+target_link_libraries(mytarget Qt5::Pdf)
diff --git a/src/pdf/doc/src/qtpdf-examples.qdoc b/src/pdf/doc/src/qtpdf-examples.qdoc
new file mode 100644
index 000000000..9daa0e7f8
--- /dev/null
+++ b/src/pdf/doc/src/qtpdf-examples.qdoc
@@ -0,0 +1,37 @@
+/****************************************************************************
+**
+** Copyright (C) 2020 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the documentation of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:FDL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU Free Documentation License Usage
+** Alternatively, this file may be used under the terms of the GNU Free
+** Documentation License version 1.3 as published by the Free Software
+** Foundation and appearing in the file included in the packaging of
+** this file. Please review the following information to ensure
+** the GNU Free Documentation License version 1.3 requirements
+** will be met: https://www.gnu.org/licenses/fdl-1.3.html.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \group qtpdf-examples
+    \ingroup all-examples
+
+    \title Qt PDF Examples
+    \brief Using the classes and types in the Qt PDF module.
+
+    The following examples illustrate how to use the C++ classes and QML types
+    in the \l{Qt PDF} module to render PDF documents.
+*/
diff --git a/src/pdf/doc/src/qtpdf-index.qdoc b/src/pdf/doc/src/qtpdf-index.qdoc
index 6893272ac..b32787eb5 100644
--- a/src/pdf/doc/src/qtpdf-index.qdoc
+++ b/src/pdf/doc/src/qtpdf-index.qdoc
@@ -39,7 +39,12 @@
     \l QPdfPageNavigation class handles the navigation through a
     PDF document.
 
-    \section1 Getting Started
+    \include module-use.qdocinc using qt module
+    \quotefile qtpdf-build.cmake
+
+    See also the \l{Build with CMake} overview.
+
+    \section2 Building with qmake
 
     To include the definitions of the module's classes, use the
     following directive:
@@ -56,6 +61,12 @@
         \li \l{Qt PDF Overview}
     \endlist
 
+    \section1 Examples
+
+    \list
+        \li \l{Qt PDF Examples}
+    \endlist
+
     \section1 API Reference
 
     \list