diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-11-16 10:08:49 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-11-16 10:08:50 +0100 |
| commit | e7c316504770ce357b2c73be485cdd8c1da9c4c1 (patch) | |
| tree | b49032420022617396a83da310ebe01b38cda8f9 /src/imports/labsmodels | |
| parent | 87265c7ab8743ece92262cd6b79bbba9dddd1fe1 (diff) | |
| parent | e3948955c961972d34483e7da9c2908f5cb84420 (diff) | |
Merge remote-tracking branch 'origin/5.12.0' into 5.12
Change-Id: I7623438dde316ae1e97802f91991f2e7ccc205a5
Diffstat (limited to 'src/imports/labsmodels')
| -rw-r--r-- | src/imports/labsmodels/dependencies.json | 2 | ||||
| -rw-r--r-- | src/imports/labsmodels/plugins.qmltypes | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/src/imports/labsmodels/dependencies.json b/src/imports/labsmodels/dependencies.json new file mode 100644 index 0000000000..0d4f101c7a --- /dev/null +++ b/src/imports/labsmodels/dependencies.json @@ -0,0 +1,2 @@ +[ +] diff --git a/src/imports/labsmodels/plugins.qmltypes b/src/imports/labsmodels/plugins.qmltypes index 606b8712da..6272069060 100644 --- a/src/imports/labsmodels/plugins.qmltypes +++ b/src/imports/labsmodels/plugins.qmltypes @@ -4,10 +4,10 @@ import QtQuick.tooling 1.2 // It is used for QML tooling purposes only. // // This file was auto-generated by: -// 'qmlplugindump -nonrelocatable Qt.labs.qmlmodels 1.0' +// 'qmlplugindump -nonrelocatable -dependencies dependencies.json Qt.labs.qmlmodels 1.0' Module { - dependencies: ["QtQuick 2.12"] + dependencies: [] Component { name: "QQmlAbstractDelegateComponent" prototype: "QQmlComponent" |