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

Conflicts:
	share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5informationnodeinstanceserver.cpp

Change-Id: I5e424e34db619bb769c7abc1e8651b7b40210839

2020-01-20 09:59:27 +01:00

..

editor3d

QmlDesigner: Initialize 3D edit view tool state at initial show

2020-01-17 14:57:44 +00:00

instances

Merge remote-tracking branch 'origin/4.11'

2020-01-20 09:59:27 +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