Merge remote branch 'origin/2.2'

diff --cc share/qtcreator/gdbmacros/dumper.py
Simple merge

diff --cc src/plugins/debugger/cdb/cdbparsehelpers.cpp
Simple merge

diff --cc src/plugins/debugger/gdb/gdbengine.cpp
Simple merge

diff --cc src/plugins/qt4projectmanager/qt-maemo/qt4maemotarget.cpp
Simple merge

diff --cc src/plugins/qt4projectmanager/qtversionmanager.cpp
Simple merge