forked from qt-creator/qt-creator
Conflicts: doc/qtdesignstudio/src/views/qtquick-designer.qdoc Change-Id: I5d7ea23e356add0cbb2ad01ceb5e433377dc51c2
Conflicts: doc/qtdesignstudio/src/views/qtquick-designer.qdoc Change-Id: I5d7ea23e356add0cbb2ad01ceb5e433377dc51c2