forked from qt-creator/qt-creator
Conflicts: src/plugins/clangcodemodel/clangdlocatorfilters.cpp Change-Id: If91f26625ea9620fb9fdbf45705b32f37cb7f158
Conflicts: src/plugins/clangcodemodel/clangdlocatorfilters.cpp Change-Id: If91f26625ea9620fb9fdbf45705b32f37cb7f158