forked from qt-creator/qt-creator
Conflicts: qtcreator.pri qtcreator.qbs src/plugins/qtsupport/qtversionmanager.cpp src/shared/qbs Change-Id: If7a93fb018799fe6ada76e79c24ab5b43dfa6fc2
Conflicts: qtcreator.pri qtcreator.qbs src/plugins/qtsupport/qtversionmanager.cpp src/shared/qbs Change-Id: If7a93fb018799fe6ada76e79c24ab5b43dfa6fc2