forked from qt-creator/qt-creator
Conflicts: src/plugins/qmldesigner/components/formeditor/formeditoritem.cpp src/plugins/qmlpreview/qmlpreviewconnectionmanager.cpp Change-Id: Ifa7c66330c1995378280cdb4c57c30015dc11b68
Conflicts: src/plugins/qmldesigner/components/formeditor/formeditoritem.cpp src/plugins/qmlpreview/qmlpreviewconnectionmanager.cpp Change-Id: Ifa7c66330c1995378280cdb4c57c30015dc11b68