forked from qt-creator/qt-creator
Conflicts: src/plugins/mcusupport/mcusupportoptions.cpp src/plugins/qmldesigner/assetexporterplugin/componentexporter.cpp Change-Id: I337d1b86f54ad4433a3ed0d73e2011654ef6b950
Conflicts: src/plugins/mcusupport/mcusupportoptions.cpp src/plugins/qmldesigner/assetexporterplugin/componentexporter.cpp Change-Id: I337d1b86f54ad4433a3ed0d73e2011654ef6b950