forked from qt-creator/qt-creator
Conflicts: src/plugins/coreplugin/locator/executefilter.cpp Change-Id: Iff5b82a9e491b782e4720138904f389d318b005c
Conflicts: src/plugins/coreplugin/locator/executefilter.cpp Change-Id: Iff5b82a9e491b782e4720138904f389d318b005c