fixes after merge
fixes after merge

Conflicts:
	src/s60installs/s60installs.pro

KDE/android-qt-mobility,kaltsi/qt-mobility,kaltsi/qt-mobility,qtproject/qt-mobility,qtproject/qt-mobility,qtproject/qt-mobility,enthought/qt-mobility,qtproject/qt-mobility,KDE/android-qt-mobility,qtproject/qt-mobility,kaltsi/qt-mobility,tmcguire/qt-mobility,enthought/qt-mobility,enthought/qt-mobility,tmcguire/qt-mobility,enthought/qt-mobility,KDE/android-qt-mobility,enthought/qt-mobility,qtproject/qt-mobility,kaltsi/qt-mobility,kaltsi/qt-mobility,tmcguire/qt-mobility,KDE/android-qt-mobility,tmcguire/qt-mobility,tmcguire/qt-mobility,kaltsi/qt-mobility,enthought/qt-mobility