diff options
| author | Sean Harmer <sean.harmer@kdab.com> | 2016-10-10 16:45:00 +0100 |
|---|---|---|
| committer | Sean Harmer <sean.harmer@kdab.com> | 2016-10-10 20:24:46 +0100 |
| commit | f82880c7b8cff8419873a936ced956d20ba88933 (patch) | |
| tree | b3802a20ca7c7abae4b53cbdf50b83d23dff733a /src/quick3d/imports/scene3d | |
| parent | d2cc3828a1da686f07c9e748b80b20fc007e37fe (diff) | |
| parent | 0826c7fbdfbc34280376ba165931f3a30c3d1e50 (diff) | |
Merge branch '5.7' into 5.8
Conflicts:
tests/auto/input/input.pro
Change-Id: I591202f144aeec915e18611dfce358d4f15faff6
Diffstat (limited to 'src/quick3d/imports/scene3d')
| -rw-r--r-- | src/quick3d/imports/scene3d/plugins.qmltypes | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/quick3d/imports/scene3d/plugins.qmltypes b/src/quick3d/imports/scene3d/plugins.qmltypes index da56b97ea..46df37093 100644 --- a/src/quick3d/imports/scene3d/plugins.qmltypes +++ b/src/quick3d/imports/scene3d/plugins.qmltypes @@ -7,7 +7,7 @@ import QtQuick.tooling 1.2 // 'qmlplugindump -nonrelocatable QtQuick.Scene3D 2.0' Module { - dependencies: ["QtQuick 2.0"] + dependencies: ["QtQuick 2.7"] Component { name: "Qt3DRender::Scene3DItem" defaultProperty: "entity" |