Eike Ziller 3d4d7c7e14 Merge remote-tracking branch 'origin/5.0' ...

Conflicts:
	src/plugins/clangtools/clangtoolssettings.cpp
	src/plugins/clangtools/executableinfo.cpp
	src/plugins/clangtools/executableinfo.h

Change-Id: Id8caf63e3e594792467d3447870086bd2d8f73b9

2021-09-13 17:03:55 +02:00

..

editor3d

Fix building with Quick 3D dev

2021-08-24 15:35:30 +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/5.0'

2021-09-13 17:03:55 +02: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

QmlPuppet: fix crash when multilanguage database is used

2021-05-06 09:01:43 +00:00