forked from qt-creator/qt-creator
Conflicts: doc/qtdesignstudio/examples/loginui1/qtquickcontrols2.conf doc/qtdesignstudio/examples/loginui2/qtquickcontrols2.conf doc/qtdesignstudio/examples/loginui3/qtquickcontrols2.conf doc/qtdesignstudio/examples/loginui4/qtquickcontrols2.conf share/qtcreator/debugger/dumper.py share/qtcreator/debugger/qttypes.py Change-Id: Id44a67cdeeb0889ff96eddcdf409d20ca7cbdd0b