Merge remote branch 'origin/2.1'

diff --cc doc/qtcreator.qdoc
Simple merge

diff --cc doc/qtcreator.qdocconf
Simple merge

diff --cc src/plugins/qmlprojectmanager/fileformat/filefilteritems.cpp
Simple merge

diff --cc src/plugins/qmlprojectmanager/fileformat/filefilteritems.h
Simple merge

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

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