Conflicts: share/qtcreator/gdbmacros/dumper.py src/libs/qmljs/qmljs-lib.pri src/plugins/fakevim/fakevimhandler.cpp