Conflicts: src/plugins/qt4projectmanager/qt-maemo/maemosettingswidget.cpp src/plugins/qt4projectmanager/qt-maemo/maemosettingswidget.h
Conflicts: src/plugins/qt4projectmanager/qt-maemo/maemosettingswidget.cpp src/plugins/qt4projectmanager/qt-maemo/maemosettingswidget.h