Eike Ziller c644e7c80a Merge remote-tracking branch 'origin/qds-1.59' ...

Conflicts:
	src/plugins/qmldesigner/components/formeditor/formeditoritem.cpp
	src/plugins/qmlpreview/qmlpreviewconnectionmanager.cpp

Change-Id: Ifa7c66330c1995378280cdb4c57c30015dc11b68

2020-06-08 16:04:15 +02:00

..

qmlpuppet

Merge remote-tracking branch 'origin/qds-1.59'

2020-06-08 16:04:15 +02:00