Eike Ziller 09efabaf89 Merge remote-tracking branch 'origin/7.0' into 8.0 ...

Change-Id: I3780a56c1e02c2e98028aaf02b54733c6f222498

2022-05-30 14:14:04 +02:00

..

commands

QmlDesigner: Fix puppet build for Qt5

2022-05-24 07:46:07 +00:00

container

ImageContainer: Fix potential use after free

2022-05-24 14:44:41 +00:00

html

QmlDesigner.NodeInstances: Move qmlpuppet to share

2011-06-22 18:24:36 +02:00

images

QmlDesigner: Update default image for Image

2021-06-11 12:09:11 +00:00

instances

QmlDesigner: Ifdef nanotrace.h out if nanotrace lib is not included

2022-01-28 14:03:26 +00:00

interfaces

Replace minitrace with nanotrace

2022-01-25 14:25:04 +00:00

mockfiles

QmlDesigner: Implement Material Editor

2022-05-23 16:44:02 +00:00

qml2puppet

QmlDesigner: Show form editor preview for 3D material root nodes

2022-05-27 08:49:14 +00:00

qmlprivategate

QmlDesigner: Fix puppet crash with DelegateModel

2022-03-24 17:10:55 +00:00

types

QmlDesigner: reduce enumeration to header only

2019-08-07 14:48:04 +00:00

editor3d_qt5.qrc

QmlDesigner: Implement Material Editor

2022-05-23 16:44:02 +00:00

editor3d_qt6.qrc

QmlDesigner: Implement Material Editor

2022-05-23 16:44:02 +00:00

qmlpuppet_utilities.pri

QmlDesigner.NodeInstances: Move qmlpuppet to share

2011-06-22 18:24:36 +02:00

qmlpuppet.qrc

QmlPuppet: Add separate set of qml files for Qt6 for 3D editor

2021-06-29 12:03:57 +00:00