forked from qt-creator/qt-creator
Conflicts: src/plugins/debugger/watchdata.cpp src/plugins/debugger/watchdata.h src/shared/qbs Change-Id: I19b338b316d9c4c046074eb85b3fec79e86e6c32
Conflicts: src/plugins/debugger/watchdata.cpp src/plugins/debugger/watchdata.h src/shared/qbs Change-Id: I19b338b316d9c4c046074eb85b3fec79e86e6c32