Merge remote-tracking branch 'origin/2.2'

diff --cc qtcreator.pri
Simple merge

diff --cc src/plugins/projectexplorer/gccparser.cpp
Simple merge

diff --cc src/plugins/projectexplorer/projectexplorer.cpp
Simple merge

diff --cc src/plugins/projectexplorer/userfileaccessor.cpp
Simple merge