Eike Ziller d02afbe6b4 Merge remote-tracking branch 'origin/4.14' ...

Conflicts:
	src/plugins/projectexplorer/gcctoolchain.cpp

Change-Id: I2136ba89d3aa3c4c2a0e7a4f9d8ba9cec32924ce

2020-11-30 16:14:32 +01:00

..

editor3d

Merge remote-tracking branch 'origin/4.14'

2020-11-19 15:38:13 +01:00

iconrenderer

QmlPuppet: Hide 3D edit view render window

2020-11-27 12:11:28 +00:00

instances

Add optional fps counter to 3D edit view

2020-11-27 14:24:40 +00:00

Info.plist

QmlDesigner: Do not allow keyboard focus on macOS for puppet

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

qml2puppet.pri

QmlDesigner: Bump the C++ version to 17 for the qml puppet too

2020-10-14 16:59:20 +00:00

qml2puppet.pro

QmlDesigner: On demand compilation of the puppet

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

qml2puppetmain.cpp

QmlDesigner: Port 3D edit view to Qt6

2020-10-20 14:55:43 +00:00