diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2020-10-21 09:31:01 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2020-10-21 09:31:01 +0200 |
| commit | dbb62016052ad70e8e3dffb60a419504c9eb6dac (patch) | |
| tree | 7926ab117c9932be15b8886ba5230048da97bc07 /share/qtcreator/qml/qmlpuppet/mockfiles/ModelNode2DImageView.qml | |
| parent | 526579b09d1be00ef2f0e371e0c57064777e6538 (diff) | |
| parent | cc6f35016ab6f7a1ce82a39582141ab8a35b7bce (diff) | |
Merge remote-tracking branch 'origin/4.14' into master
Change-Id: Id7ad82997873da828456a15c441620d93c6fc7e7
Diffstat (limited to 'share/qtcreator/qml/qmlpuppet/mockfiles/ModelNode2DImageView.qml')
| -rw-r--r-- | share/qtcreator/qml/qmlpuppet/mockfiles/ModelNode2DImageView.qml | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/share/qtcreator/qml/qmlpuppet/mockfiles/ModelNode2DImageView.qml b/share/qtcreator/qml/qmlpuppet/mockfiles/ModelNode2DImageView.qml index c4bd31d7e7..2302547715 100644 --- a/share/qtcreator/qml/qmlpuppet/mockfiles/ModelNode2DImageView.qml +++ b/share/qtcreator/qml/qmlpuppet/mockfiles/ModelNode2DImageView.qml @@ -24,6 +24,7 @@ ****************************************************************************/ import QtQuick 2.15 +import QtQuick3D 1.15 Item { id: root @@ -32,8 +33,12 @@ Item { property alias contentItem: contentItem + View3D { + // Dummy view to hold the context in case View3D items are used in the component + // TODO remove when QTBUG-87678 is fixed + } + Item { id: contentItem - anchors.fill: parent } } |