Eike Ziller ff5bfe6f0f Merge remote-tracking branch 'origin/6.0' ...

Conflicts:
	cmake/QtCreatorIDEBranding.cmake
	qbs/modules/qtc/qtc.qbs
	qtcreator_ide_branding.pri

Change-Id: I366a1a0e378811dfc9b4e6f42ec96426dbb15356

2021-11-15 13:14:24 +01:00

..

editor3d

Use global picking API

2021-10-14 04:08:33 +00:00

iconrenderer

QmlPuppet: Fix imported 3D asset library icon generation

2021-06-29 14:28:24 +00:00

import3d

QmlDesigner: Fix compile error

2021-02-05 11:54:41 +00:00

instances

Merge remote-tracking branch 'origin/6.0'

2021-11-15 13:14:24 +01:00

Info.plist

QmlDesigner: Do not allow keyboard focus on macOS for puppet

2020-03-26 08:27:07 +00:00

qml2puppet.pri

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

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

qml2puppet.pro

QmlDesigner: On demand compilation of the puppet

2014-04-09 16:01:05 +02:00

qml2puppetmain.cpp

Use lowercase for Windows header for supporting cross-compilation

2021-09-27 07:23:22 +00:00