diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-10-04 01:00:22 +0200 |
|---|---|---|
| committer | Ulf Hermann <ulf.hermann@qt.io> | 2019-10-04 11:29:16 +0200 |
| commit | 9c7121df1579d38c7f4136da6146d7acae8fedcc (patch) | |
| tree | 0917e293d83b4c1ce635cf65185e6ad98fe66519 /src/imports/labsanimation | |
| parent | f529d38103a6c1c5c7b76ad92e0e5641719e369e (diff) | |
| parent | c211b93bb87308601fe1c808634eb648d1949c40 (diff) | |
Merge remote-tracking branch 'origin/5.14' into 5.15
Conflicts:
src/imports/qtquick2/plugins.qmltypes
src/quick/items/qquickitemsmodule.cpp
Change-Id: I841c65c9c131354788b4f3fcfe3d7ed27be316d5
Diffstat (limited to 'src/imports/labsanimation')
| -rw-r--r-- | src/imports/labsanimation/plugins.qmltypes | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/imports/labsanimation/plugins.qmltypes b/src/imports/labsanimation/plugins.qmltypes index 065e65ad7a..2ecc5e6f5d 100644 --- a/src/imports/labsanimation/plugins.qmltypes +++ b/src/imports/labsanimation/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.animation 1.0' +// 'qmlplugindump -nonrelocatable -dependencies dependencies.json Qt.labs.animation 1.0' Module { - dependencies: ["QtQuick 2.0"] + dependencies: [] Component { name: "QQuickBoundaryRule" prototype: "QObject" |