Make QtPdf a proper generated module

- remove plugins.qmltypes, because it's generated automatically since
  d32563a3365fd9432993590e6ac9817fe6f6bd41
- plugin code is also generated, so we don't need plugin-related CMake
  commands
- QtQuick is a dependency; auto means forward the import version to the
  dependency.
- QtQuick.Controls is only needed in bundled qml files, and we expect
  tooling to find it from import statements. It's not declared as a
  cmake dependency because we don't use it from C++.
- move qml files into the source directory so that the implicit import
  matches the module directory
- move style-specific PdfStyle.qml files into directories beginning
  with capital letters, since we are moving them anyway, and the
  styles now have capitalized names

Change-Id: If517ce30d0e22fb0354272cd2002841fd2783cfc
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>

8 files changed, 7 insertions, 62 deletions

diff --git a/src/pdfquick/qml/+material/PdfStyle.qml b/src/pdfquick/+Material/PdfStyle.qml
index 6ec0741b4..6ec0741b4 100644
--- a/src/pdfquick/qml/+material/PdfStyle.qml
+++ b/src/pdfquick/+Material/PdfStyle.qml
diff --git a/src/pdfquick/qml/+universal/PdfStyle.qml b/src/pdfquick/+Universal/PdfStyle.qml
index 3c322359a..3c322359a 100644
--- a/src/pdfquick/qml/+universal/PdfStyle.qml
+++ b/src/pdfquick/+Universal/PdfStyle.qml
diff --git a/src/pdfquick/CMakeLists.txt b/src/pdfquick/CMakeLists.txt
index 18b43dbbf..19520d2da 100644
--- a/src/pdfquick/CMakeLists.txt
+++ b/src/pdfquick/CMakeLists.txt
@@ -2,23 +2,20 @@ find_package(Qt6 ${PROJECT_VERSION} CONFIG REQUIRED COMPONENTS Core Gui Qml Quic
 
 set(qml_files
 # TODO:
-#    "qml/+material/PdfStyle.qml"
-#    "qml/+universal/PdfStyle.qml"
-    "qml/PdfMultiPageView.qml"
-    "qml/PdfPageView.qml"
-    "qml/PdfScrollablePageView.qml"
-    "qml/PdfStyle.qml"
+#    "+Material/PdfStyle.qml"
+#    "+Universal/PdfStyle.qml"
+    "PdfMultiPageView.qml"
+    "PdfPageView.qml"
+    "PdfScrollablePageView.qml"
+    "PdfStyle.qml"
 )
 
 qt_internal_add_qml_module(PdfQuick
     URI "QtQuick.Pdf"
     VERSION "${PROJECT_VERSION}"
-    CLASS_NAME QtQuickPdfPlugin
-    NO_PLUGIN_OPTIONAL
-    PLUGIN_TARGET qtpdfquickplugin
     PAST_MAJOR_VERSIONS 5
     QML_FILES ${qml_files}
-    DEPENDENCIES QtQuickControls2
+    DEPENDENCIES QtQuick/auto
     SOURCES
         qquickpdfdocument.cpp qquickpdfdocument_p.h
         qquickpdflinkmodel.cpp qquickpdflinkmodel_p.h
diff --git a/src/pdfquick/qml/PdfMultiPageView.qml b/src/pdfquick/PdfMultiPageView.qml
index be90f5e00..be90f5e00 100644
--- a/src/pdfquick/qml/PdfMultiPageView.qml
+++ b/src/pdfquick/PdfMultiPageView.qml
diff --git a/src/pdfquick/qml/PdfPageView.qml b/src/pdfquick/PdfPageView.qml
index a6371538a..a6371538a 100644
--- a/src/pdfquick/qml/PdfPageView.qml
+++ b/src/pdfquick/PdfPageView.qml
diff --git a/src/pdfquick/qml/PdfScrollablePageView.qml b/src/pdfquick/PdfScrollablePageView.qml
index 4c8db84b8..4c8db84b8 100644
--- a/src/pdfquick/qml/PdfScrollablePageView.qml
+++ b/src/pdfquick/PdfScrollablePageView.qml
diff --git a/src/pdfquick/qml/PdfStyle.qml b/src/pdfquick/PdfStyle.qml
index 55e9ca3c9..55e9ca3c9 100644
--- a/src/pdfquick/qml/PdfStyle.qml
+++ b/src/pdfquick/PdfStyle.qml
diff --git a/src/pdfquick/plugins.qmltypes b/src/pdfquick/plugins.qmltypes
deleted file mode 100644
index a30361d33..000000000
--- a/src/pdfquick/plugins.qmltypes
+++ /dev/null
@@ -1,52 +0,0 @@
-import QtQuick.tooling 1.2
-
-// This file describes the plugin-supplied types contained in the library.
-// It is used for QML tooling purposes only.
-//
-// This file was auto-generated by:
-// 'qmlplugindump -nonrelocatable QtQuick.Pdf 5.14'
-
-Module {
-    dependencies: [
-        "QtGraphicalEffects 1.12",
-        "QtQuick 2.14",
-        "QtQuick.Controls 2.14",
-        "QtQuick.Controls.Fusion 2.14",
-        "QtQuick.Controls.Fusion.impl 2.14",
-        "QtQuick.Controls.Imagine 2.14",
-        "QtQuick.Controls.Imagine.impl 2.14",
-        "QtQuick.Controls.Material 2.14",
-        "QtQuick.Controls.Material.impl 2.14",
-        "QtQuick.Controls.Universal 2.14",
-        "QtQuick.Controls.Universal.impl 2.12",
-        "QtQuick.Controls.impl 2.14",
-        "QtQuick.Shapes 1.14",
-        "QtQuick.Templates 2.14",
-        "QtQuick.Window 2.2"
-    ]
-    Component {
-        name: "QQuickPdfDocument"
-        prototype: "QObject"
-        exports: ["QtQuick.Pdf/PdfDocument 5.14"]
-        exportMetaObjectRevisions: [0]
-        Property { name: "source"; type: "QUrl" }
-        Property { name: "pageCount"; type: "int"; isReadonly: true }
-        Property { name: "password"; type: "string" }
-        Property { name: "status"; type: "QPdfDocument::Status"; isReadonly: true }
-        Property { name: "title"; type: "string"; isReadonly: true }
-        Property { name: "subject"; type: "string"; isReadonly: true }
-        Property { name: "author"; type: "string"; isReadonly: true }
-        Property { name: "keywords"; type: "string"; isReadonly: true }
-        Property { name: "producer"; type: "string"; isReadonly: true }
-        Property { name: "creator"; type: "string"; isReadonly: true }
-        Property { name: "creationDate"; type: "QDateTime"; isReadonly: true }
-        Property { name: "modificationDate"; type: "QDateTime"; isReadonly: true }
-        Signal { name: "passwordRequired" }
-        Signal { name: "metaDataLoaded" }
-        Method {
-            name: "pagePointSize"
-            type: "QSizeF"
-            Parameter { name: "page"; type: "int" }
-        }
-    }
-}