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