Conflicts: share/qtcreator/gdbmacros/dumper.py src/plugins/cppeditor/cpphoverhandler.cpp src/plugins/cppeditor/cpphoverhandler.h