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

Conflicts:
	src/plugins/genericprojectmanager/genericprojectplugin.cpp
	src/plugins/projectexplorer/environmentaspect.cpp
	src/plugins/projectexplorer/environmentaspect.h
	src/plugins/projectexplorer/environmentaspectwidget.cpp

Change-Id: Id21d62cf14419febd1e06c9b429fcdf4501c0eaf

2019-11-11 12:58:11 +01:00

..

editor3d

Qml2Puppet: Compile fix

2019-11-11 09:43:33 +00:00

instances

Merge remote-tracking branch 'origin/4.11'

2019-11-11 12:58:11 +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