Eike Ziller 267946d100 Merge remote-tracking branch 'origin/4.11' ...

Conflicts:
	cmake/QtCreatorIDEBranding.cmake
	qbs/modules/qtc/qtc.qbs
	qtcreator_ide_branding.pri
	src/plugins/boot2qt/qdbrunconfiguration.cpp
	src/plugins/boot2qt/qdbrunconfiguration.h
	src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.cpp
	src/plugins/qnx/qnxrunconfiguration.cpp
	src/plugins/remotelinux/remotelinuxrunconfiguration.h

Change-Id: I17c8e1bf300bb75d7317ccf7749dd3cc07709c21

2019-12-16 16:19:44 +01:00

..

editor3d

QmlDesigner: Fix minor edit 3D view ui issues in mac

2019-12-13 14:44:23 +00:00

instances

Merge remote-tracking branch 'origin/4.11'

2019-12-16 16:19:44 +01:00

Info.plist

QmlDesigner: Fix keyboard focus on mac for 3D edit view

2019-10-14 11:31:46 +00:00

qml2puppet.pri

Add edit camera controls for 3D edit view

2019-10-21 08:27:16 +00:00

qml2puppet.pro

QmlDesigner: On demand compilation of the puppet

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

qml2puppetmain.cpp

QmlDesigner: Introduce QMLDESIGNER_QUICK3D_MODE

2019-10-15 12:43:27 +00:00