qt-creator

Files

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

editor3d

Merge remote-tracking branch 'origin/8.0'

2022-08-05 08:50:27 +02:00

iconrenderer

qml2puppet: fix build

2022-07-12 09:58:52 +00:00

import3d

QmlPuppet: Adapt to C++ 17 [[maybe_unused]]

2022-07-11 09:29:37 +00:00

instances

Merge remote-tracking branch 'origin/8.0'