Resolves merge conflict in master-from-1.1 for Location.
Resolves merge conflict in master-from-1.1 for Location.

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