forked from qt-creator/qt-creator
Conflicts: src/plugins/projectexplorer/miniprojecttargetselector.cpp Change-Id: Ie831644eb1c69beed6791cbc67cbfb9309dcd351
Conflicts: src/plugins/projectexplorer/miniprojecttargetselector.cpp Change-Id: Ie831644eb1c69beed6791cbc67cbfb9309dcd351