diff options
author | Leander Beernaert <leander.beernaert@qt.io> | 2019-11-18 16:15:01 +0100 |
---|---|---|
committer | Leander Beernaert <leander.beernaert@qt.io> | 2019-11-25 15:34:40 +0100 |
commit | f1f395b37da163bce2dc3b5fc4e298bb4f56a3e7 (patch) | |
tree | 9ce2ba89a86ed754a8ecb8f52181770853e21a08 /tests/auto/qml/qmlplugindump | |
parent | ba494aaa24defe1401f621b791891e696b308756 (diff) | |
parent | 0ee087f5a5edd7d1aa39fd15e0dc85985320c09a (diff) |
Merge remote-tracking branch 'origin/dev' into wip/cmake
Change-Id: I48b9c2e4f3a75c18470c55f73f2089dc1401de54
Diffstat (limited to 'tests/auto/qml/qmlplugindump')
4 files changed, 18 insertions, 1 deletions
diff --git a/tests/auto/qml/qmlplugindump/data/dumper/Imports/Derived.qml b/tests/auto/qml/qmlplugindump/data/dumper/Imports/Derived.qml new file mode 100644 index 0000000000..2f0ac401d7 --- /dev/null +++ b/tests/auto/qml/qmlplugindump/data/dumper/Imports/Derived.qml @@ -0,0 +1,6 @@ +pragma Singleton +import dumper.Imports 1.0 + +Imports { + property int something: 2 +} diff --git a/tests/auto/qml/qmlplugindump/data/dumper/Imports/imports.pro b/tests/auto/qml/qmlplugindump/data/dumper/Imports/imports.pro index d20ea967ea..b4bd9baf5b 100644 --- a/tests/auto/qml/qmlplugindump/data/dumper/Imports/imports.pro +++ b/tests/auto/qml/qmlplugindump/data/dumper/Imports/imports.pro @@ -17,7 +17,7 @@ HEADERS += \ imports.h !equals(_PRO_FILE_PWD_, $$OUT_PWD) { - cp.files = qmldir plugins.qmltypes CompositeImports.qml + cp.files = qmldir plugins.qmltypes CompositeImports.qml Derived.qml cp.path = $$OUT_PWD COPIES += cp } diff --git a/tests/auto/qml/qmlplugindump/data/dumper/Imports/plugins.qmltypes b/tests/auto/qml/qmlplugindump/data/dumper/Imports/plugins.qmltypes index 937dd60a9e..fb13928ba0 100644 --- a/tests/auto/qml/qmlplugindump/data/dumper/Imports/plugins.qmltypes +++ b/tests/auto/qml/qmlplugindump/data/dumper/Imports/plugins.qmltypes @@ -14,4 +14,14 @@ Module { exports: ["dumper.Imports/Imports 1.0"] exportMetaObjectRevisions: [0] } + Component { + prototype: "Imports" + name: "dumper.Imports/Derived 1.0" + exports: ["dumper.Imports/Derived 1.0"] + exportMetaObjectRevisions: [0] + isComposite: true + isCreatable: false + isSingleton: true + Property { name: "something"; type: "int" } + } } diff --git a/tests/auto/qml/qmlplugindump/data/dumper/Imports/qmldir b/tests/auto/qml/qmlplugindump/data/dumper/Imports/qmldir index c9058a7f95..f84fca1d75 100644 --- a/tests/auto/qml/qmlplugindump/data/dumper/Imports/qmldir +++ b/tests/auto/qml/qmlplugindump/data/dumper/Imports/qmldir @@ -1,3 +1,4 @@ module dumper.Imports plugin Imports CompositeImports 1.0 CompositeImports.qml +singleton Derived 1.0 Derived.qml |