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

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

Change-Id: I8ea57eba526ab830608fd928c28771c5441749f8

2019-11-01 15:31:19 +01:00

..

qmlpuppet

Merge remote-tracking branch 'origin/4.11'

2019-11-01 15:31:19 +01:00