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

1 files changed, 8 insertions, 0 deletions

diff --git a/src/pdf/quick/plugin.cpp b/src/pdf/quick/plugin.cpp
index 664ba51ab..bb68a817e 100644
--- a/src/pdf/quick/plugin.cpp
+++ b/src/pdf/quick/plugin.cpp
@@ -39,7 +39,10 @@
 #include <QtQml/qqmlengine.h>
 #include <QtQml/qqmlextensionplugin.h>
 #include "qquickpdfdocument_p.h"
+#include "qquickpdflinkmodel_p.h"
+#include "qquickpdfnavigationstack_p.h"
 #include "qquickpdfsearchmodel_p.h"
+#include "qquickpdfselection_p.h"
 
 QT_BEGIN_NAMESPACE
 
@@ -80,9 +83,14 @@ public:
         qmlRegisterModule(uri, 2, QT_VERSION_MINOR);
 
         qmlRegisterType<QQuickPdfDocument>(uri, 5, 15, "PdfDocument");
+        qmlRegisterType<QQuickPdfLinkModel>(uri, 5, 15, "PdfLinkModel");
+        qmlRegisterType<QQuickPdfNavigationStack>(uri, 5, 15, "PdfNavigationStack");
         qmlRegisterType<QQuickPdfSearchModel>(uri, 5, 15, "PdfSearchModel");
+        qmlRegisterType<QQuickPdfSelection>(uri, 5, 15, "PdfSelection");
 
         qmlRegisterType(QUrl("qrc:/qt-project.org/qtpdf/qml/PdfPageView.qml"), uri, 5, 15, "PdfPageView");
+        qmlRegisterType(QUrl("qrc:/qt-project.org/qtpdf/qml/PdfMultiPageView.qml"), uri, 5, 15, "PdfMultiPageView");
+        qmlRegisterType(QUrl("qrc:/qt-project.org/qtpdf/qml/PdfScrollablePageView.qml"), uri, 5, 15, "PdfScrollablePageView");
     }
 };