Merge remote branch 'origin/2.1'

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

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

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

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

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

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

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