forked from qt-creator/qt-creator
Conflicts: src/plugins/qt4projectmanager/qt-maemo/maemodeploystep.cpp src/plugins/qt4projectmanager/qt-maemo/qt4maemotarget.cpp src/plugins/qt4projectmanager/qt-maemo/qt4maemotarget.h
Conflicts: src/plugins/qt4projectmanager/qt-maemo/maemodeploystep.cpp src/plugins/qt4projectmanager/qt-maemo/qt4maemotarget.cpp src/plugins/qt4projectmanager/qt-maemo/qt4maemotarget.h