Eike Ziller 64247bf571 Merge remote-tracking branch 'origin/8.0' ...

Reverts/comments out parts of 45f93a817a,
which needs to be resolved in a follow-up commit.

 Conflicts:
	cmake/QtCreatorIDEBranding.cmake
	qbs/modules/qtc/qtc.qbs
	qtcreator_ide_branding.pri
	share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5informationnodeinstanceserver.cpp
	src/plugins/clangcodemodel/clangmodelmanagersupport.cpp
	src/plugins/cmakeprojectmanager/cmakesettingspage.cpp
	src/plugins/python/pythoneditor.cpp
	src/plugins/qmldesigner/designercore/instances/nodeinstanceview.cpp
	src/plugins/scxmleditor/common/colorsettings.cpp

Change-Id: I7f0f7b7120e75a9fc3a8886bc57c17345cbb501b

2022-08-19 12:48:27 +02:00

..

commands

Sync color between environment map and 3D Editor background

2022-08-03 09:35:11 +00:00

container

QmlDesigner: Add type enumeration to auxiliary data

2022-08-09 17:52:03 +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

QmlDesigner: rotBlock is using it own aux type

2022-08-16 16:13:46 +00:00

mockfiles

QmlDesigner: Add environment and model selectors to material preview

2022-08-11 13:33:59 +00:00

qml2puppet

Merge remote-tracking branch 'origin/8.0'

2022-08-19 12:48:27 +02:00

qmlprivategate

qmlpuppet: remove qmlprivategate DesignerSupport < Qt 5.6

2022-07-12 09:20:04 +00:00

types

QmlDesigner: reduce enumeration to header only

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

editor3d_qt5.qrc

QmlDesigner: Add environment and model selectors to material preview

2022-08-11 13:33:59 +00:00

editor3d_qt6.qrc

QmlDesigner: Add environment and model selectors to material preview

2022-08-11 13:33:59 +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