diff options
author | Ulf Hermann <ulf.hermann@qt.io> | 2020-05-18 19:55:25 +0200 |
---|---|---|
committer | Ulf Hermann <ulf.hermann@qt.io> | 2020-05-26 14:04:43 +0200 |
commit | 6d3aae3cf47fbf21bd27eda7a249c2a23308156e (patch) | |
tree | 02dd24091b28bfc05fa60185bf63b2daf36d459b /src/qmltyperegistrar | |
parent | fe42d2ea631b82974dbccbe65c6f039b837c9150 (diff) |
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>
Diffstat (limited to 'src/qmltyperegistrar')
-rw-r--r-- | src/qmltyperegistrar/qmltyperegistrar.cpp | 8 | ||||
-rw-r--r-- | src/qmltyperegistrar/qmltypes.prf | 3 | ||||
-rw-r--r-- | src/qmltyperegistrar/qmltypescreator.cpp | 25 | ||||
-rw-r--r-- | src/qmltyperegistrar/qmltypescreator.h | 2 |
4 files changed, 3 insertions, 35 deletions
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); } |