From e52e7ad76edc6012285db6c83eb12e8724a234ac Mon Sep 17 00:00:00 2001 From: Ulf Hermann Date: Thu, 2 Jul 2020 17:40:07 +0200 Subject: qmlplugindump: Fix handling of dependencies Tolerate dependencies without version and don't write them into the output anymore. No one should read them as the same info has to be available from the associated qmldir files. Change-Id: I5e4cd93c83cb5e874a8a6e1467461d081b1a089c Reviewed-by: Fabian Kosmale --- tests/auto/qml/qmlplugindump/data/dumper/Dummy/plugins.qmltypes | 1 - tests/auto/qml/qmlplugindump/data/dumper/ExtendedType/plugins.qmltypes | 1 - tests/auto/qml/qmlplugindump/data/dumper/Imports/plugins.qmltypes | 1 - tests/auto/qml/qmlplugindump/data/dumper/Versions/plugins.qmltypes | 1 - 4 files changed, 4 deletions(-) (limited to 'tests/auto/qml/qmlplugindump') diff --git a/tests/auto/qml/qmlplugindump/data/dumper/Dummy/plugins.qmltypes b/tests/auto/qml/qmlplugindump/data/dumper/Dummy/plugins.qmltypes index da0f2f24e4..76c3de33dd 100644 --- a/tests/auto/qml/qmlplugindump/data/dumper/Dummy/plugins.qmltypes +++ b/tests/auto/qml/qmlplugindump/data/dumper/Dummy/plugins.qmltypes @@ -7,7 +7,6 @@ import QtQuick.tooling 1.2 // 'qmlplugindump -nonrelocatable -noforceqtquick dumper.Dummy 1.0 .' Module { - dependencies: [] Component { name: "Dummy" prototype: "QObject" diff --git a/tests/auto/qml/qmlplugindump/data/dumper/ExtendedType/plugins.qmltypes b/tests/auto/qml/qmlplugindump/data/dumper/ExtendedType/plugins.qmltypes index 5c5ae73ca5..ded5054e14 100644 --- a/tests/auto/qml/qmlplugindump/data/dumper/ExtendedType/plugins.qmltypes +++ b/tests/auto/qml/qmlplugindump/data/dumper/ExtendedType/plugins.qmltypes @@ -7,7 +7,6 @@ import QtQuick.tooling 1.2 // 'qmlplugindump -nonrelocatable -noforceqtquick dumper.ExtendedType 1.1 .' Module { - dependencies: [] Component { name: "DerivedType1" prototype: "Type" diff --git a/tests/auto/qml/qmlplugindump/data/dumper/Imports/plugins.qmltypes b/tests/auto/qml/qmlplugindump/data/dumper/Imports/plugins.qmltypes index fb13928ba0..992ce6087f 100644 --- a/tests/auto/qml/qmlplugindump/data/dumper/Imports/plugins.qmltypes +++ b/tests/auto/qml/qmlplugindump/data/dumper/Imports/plugins.qmltypes @@ -7,7 +7,6 @@ import QtQuick.tooling 1.2 // 'qmlplugindump -nonrelocatable -noforceqtquick dumper.Imports 1.0 .' Module { - dependencies: ["QtQuick 2.0"] Component { name: "Imports" prototype: "QObject" diff --git a/tests/auto/qml/qmlplugindump/data/dumper/Versions/plugins.qmltypes b/tests/auto/qml/qmlplugindump/data/dumper/Versions/plugins.qmltypes index ce003fc535..dd2832b4ae 100644 --- a/tests/auto/qml/qmlplugindump/data/dumper/Versions/plugins.qmltypes +++ b/tests/auto/qml/qmlplugindump/data/dumper/Versions/plugins.qmltypes @@ -7,7 +7,6 @@ import QtQuick.tooling 1.2 // 'qmlplugindump -nonrelocatable -noforceqtquick dumper.Versions 1.1 .' Module { - dependencies: [] Component { name: "Versions" prototype: "QObject" -- cgit v1.2.3