Remove --dependencies option from qmltyperegistrar

We don't need to list the dependencies in the qmltypes files. The
information given in the qmldir file should be enough. Ultimately, we
should get rid of all hidden dependencies.

Task-number: QTBUG-84286
Change-Id: Iaf67d476b449215715270043591d8c4858104ea6
Reviewed-by: Christian Kamm <mail@ckamm.de>
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>

17 files changed, 3 insertions, 61 deletions

diff --git a/src/imports/labsanimation/dependencies.json b/src/imports/labsanimation/dependencies.json
deleted file mode 100644
index 0d4f101c7a..0000000000
--- a/src/imports/labsanimation/dependencies.json
+++ /dev/null
@@ -1,2 +0,0 @@
-[
-]
diff --git a/src/imports/labsmodels/dependencies.json b/src/imports/labsmodels/dependencies.json
deleted file mode 100644
index 0d4f101c7a..0000000000
--- a/src/imports/labsmodels/dependencies.json
+++ /dev/null
@@ -1,2 +0,0 @@
-[
-]
diff --git a/src/imports/localstorage/dependencies.json b/src/imports/localstorage/dependencies.json
deleted file mode 100644
index 0d4f101c7a..0000000000
--- a/src/imports/localstorage/dependencies.json
+++ /dev/null
@@ -1,2 +0,0 @@
-[
-]
diff --git a/src/imports/qtqml/dependencies.json b/src/imports/qtqml/dependencies.json
deleted file mode 100644
index 0d4f101c7a..0000000000
--- a/src/imports/qtqml/dependencies.json
+++ /dev/null
@@ -1,2 +0,0 @@
-[
-]
diff --git a/src/imports/qtquick2/dependencies.json b/src/imports/qtquick2/dependencies.json
deleted file mode 100644
index 0d4f101c7a..0000000000
--- a/src/imports/qtquick2/dependencies.json
+++ /dev/null
@@ -1,2 +0,0 @@
-[
-]
diff --git a/src/imports/settings/dependencies.json b/src/imports/settings/dependencies.json
deleted file mode 100644
index 0d4f101c7a..0000000000
--- a/src/imports/settings/dependencies.json
+++ /dev/null
@@ -1,2 +0,0 @@
-[
-]
diff --git a/src/imports/statemachine/dependencies.json b/src/imports/statemachine/dependencies.json
deleted file mode 100644
index 0d4f101c7a..0000000000
--- a/src/imports/statemachine/dependencies.json
+++ /dev/null
@@ -1,2 +0,0 @@
-[
-]
diff --git a/src/imports/testlib/dependencies.json b/src/imports/testlib/dependencies.json
deleted file mode 100644
index b2c4125178..0000000000
--- a/src/imports/testlib/dependencies.json
+++ /dev/null
@@ -1 +0,0 @@
-["QtQuick 2.0", "QtQuick.Window 2.0"]
diff --git a/src/qml/Qt6QmlMacros.cmake b/src/qml/Qt6QmlMacros.cmake
index 1e3ac50b57..3b384f5dae 100644
--- a/src/qml/Qt6QmlMacros.cmake
+++ b/src/qml/Qt6QmlMacros.cmake
@@ -548,11 +548,6 @@ function(qt6_qml_type_registration target)
         "@${foreign_types_file}"
     )
 
-    set(dependencies_json_file "${target_source_dir}/dependencies.json")
-    if (EXISTS ${dependencies_json_file})
-        list(APPEND cmd_args --dependencies=${dependencies_json_file})
-    endif()
-
     if (TARGET ${target}Private)
         list(APPEND cmd_args --private-includes)
     endif()
diff --git a/src/qml/dependencies.json b/src/qml/dependencies.json
deleted file mode 100644
index fe51488c70..0000000000
--- a/src/qml/dependencies.json
+++ /dev/null
@@ -1 +0,0 @@
-[]
diff --git a/src/qmlmodels/dependencies.json b/src/qmlmodels/dependencies.json
deleted file mode 100644
index 0d4f101c7a..0000000000
--- a/src/qmlmodels/dependencies.json
+++ /dev/null
@@ -1,2 +0,0 @@
-[
-]
diff --git a/src/qmltyperegistrar/qmltyperegistrar.cpp b/src/qmltyperegistrar/qmltyperegistrar.cpp
index e6b0ee8cd9..49929e9c1e 100644
--- a/src/qmltyperegistrar/qmltyperegistrar.cpp
+++ b/src/qmltyperegistrar/qmltyperegistrar.cpp
@@ -267,12 +267,6 @@ int main(int argc, char **argv)
     foreignTypesOption.setValueName(QStringLiteral("foreign types"));
     parser.addOption(foreignTypesOption);
 
-    QCommandLineOption dependenciesOption(QStringLiteral("dependencies"));
-    dependenciesOption.setDescription(QStringLiteral("JSON file with dependencies to be stated in "
-                                                     "qmltypes file."));
-    dependenciesOption.setValueName(QStringLiteral("dependencies.json"));
-    parser.addOption(dependenciesOption);
-
     parser.addPositionalArgument(QStringLiteral("[MOC generated json file]"),
                                  QStringLiteral("MOC generated json output."));
 
@@ -491,6 +485,6 @@ int main(int argc, char **argv)
     creator.setModule(module);
     creator.setVersion(QTypeRevision::fromVersion(parser.value(majorVersionOption).toInt(), 0));
 
-    creator.generate(parser.value(pluginTypesOption), parser.value(dependenciesOption));
+    creator.generate(parser.value(pluginTypesOption));
     return EXIT_SUCCESS;
 }
diff --git a/src/qmltyperegistrar/qmltypes.prf b/src/qmltyperegistrar/qmltypes.prf
index 4b112351ec..18fd089c0a 100644
--- a/src/qmltyperegistrar/qmltypes.prf
+++ b/src/qmltyperegistrar/qmltypes.prf
@@ -60,9 +60,6 @@ QML_TYPEREGISTRAR_FLAGS = \
     --minor-version=$$QML_IMPORT_MINOR_VERSION \
     --foreign-types=$$join(QML_FOREIGN_METATYPES, ',')
 
-DEPENDENCIESFILE = $$_PRO_FILE_PWD_/dependencies.json
-exists($$DEPENDENCIESFILE): QML_TYPEREGISTRAR_FLAGS += --dependencies=$$DEPENDENCIESFILE
-
 !isEmpty(MODULE_PRIVATE_INCLUDES): QML_TYPEREGISTRAR_FLAGS += --private-includes
 
 METATYPES_JSON = $$lower($$basename(TARGET))_metatypes.json
diff --git a/src/qmltyperegistrar/qmltypescreator.cpp b/src/qmltyperegistrar/qmltypescreator.cpp
index d74d59062f..34e3e053a8 100644
--- a/src/qmltyperegistrar/qmltypescreator.cpp
+++ b/src/qmltyperegistrar/qmltypescreator.cpp
@@ -336,7 +336,7 @@ void QmlTypesCreator::writeComponents()
     }
 }
 
-void QmlTypesCreator::generate(const QString &outFileName, const QString &dependenciesFileName)
+void QmlTypesCreator::generate(const QString &outFileName)
 {
     m_qml.writeStartDocument();
     m_qml.writeLibraryImport(QLatin1String("QtQuick.tooling"), 1, 2);
@@ -347,29 +347,6 @@ void QmlTypesCreator::generate(const QString &outFileName, const QString &depend
             "\n// This file was auto-generated by qmltyperegistrar.\n\n"));
     m_qml.writeStartObject(QLatin1String("Module"));
 
-    QStringList dependencies;
-    if (!dependenciesFileName.isEmpty()) {
-        QFile file(dependenciesFileName);
-        if (!file.open(QIODevice::ReadOnly)) {
-            fprintf(stderr, "Failed to open %s\n", qPrintable(dependenciesFileName));
-        } else {
-            QJsonParseError error { -1, QJsonParseError::NoError };
-            QJsonDocument doc = QJsonDocument::fromJson(file.readAll(), &error);
-            if (error.error != QJsonParseError::NoError) {
-                fprintf(stderr, "Failed to parse %s\n", qPrintable(dependenciesFileName));
-            } else {
-                const QJsonArray array = doc.array();
-                for (const QJsonValue &value : array)
-                    dependencies.append(enquote(value.toString()));
-            }
-        }
-    } else {
-        // Default dependency is QtQuick 2.0
-        dependencies.append(enquote(QLatin1String("QtQuick 2.0")));
-    }
-
-    m_qml.writeArrayBinding(QLatin1String("dependencies"), dependencies);
-
     writeComponents();
 
     m_qml.writeEndObject();
diff --git a/src/qmltyperegistrar/qmltypescreator.h b/src/qmltyperegistrar/qmltypescreator.h
index 808c189323..53976e775e 100644
--- a/src/qmltyperegistrar/qmltypescreator.h
+++ b/src/qmltyperegistrar/qmltypescreator.h
@@ -40,7 +40,7 @@ class QmlTypesCreator
 public:
     QmlTypesCreator() : m_qml(&m_output) {}
 
-    void generate(const QString &outFileName, const QString &dependenciesFileName);
+    void generate(const QString &outFileName);
 
     void setOwnTypes(QVector<QJsonObject> ownTypes) { m_ownTypes = std::move(ownTypes); }
     void setForeignTypes(QVector<QJsonObject> foreignTypes) { m_foreignTypes = std::move(foreignTypes); }
diff --git a/src/qmlworkerscript/dependencies.json b/src/qmlworkerscript/dependencies.json
deleted file mode 100644
index 0d4f101c7a..0000000000
--- a/src/qmlworkerscript/dependencies.json
+++ /dev/null
@@ -1,2 +0,0 @@
-[
-]
diff --git a/src/quick/dependencies.json b/src/quick/dependencies.json
deleted file mode 100644
index fe51488c70..0000000000
--- a/src/quick/dependencies.json
+++ /dev/null
@@ -1 +0,0 @@
-[]