forked from qt-creator/qt-creator
8cde647972
Conflicts: doc/qtdesignstudio/src/views/qtquick-designer.qdoc src/plugins/studiowelcome/stylemodel.cpp Change-Id: I13c9e4e9404619d7ba649eae160774aafc042610