Merge branch 'master' into map_double_click_zoom

Conflicts:
	src/src.pro

diff --cc src/src.pro
index 253e1a6,9f5825e..d1377cd
--- 1/src/src.pro
--- 2/src/src.pro
+++ b/src/src.pro
@@@ -122,19 -122,18 +122,20 @@@ simulator 
          SOURCES += network/networkhandlerprivate.cpp
          HEADERS += network/networkhandlerprivate.h
          QT += dbus
 -        CONFIG += icd2 qdbus
 -        SOURCES += gps/gpspositionprivateliblocation.cpp \
 -                   gps/liblocationwrapper.cpp \
 -                   gps/geopositioninfo.cpp \
 -                   gps/geocoordinate.cpp
 -        HEADERS += gps/gpspositionprivateliblocation.h \
 -                   gps/liblocationwrapper.h \
 -                   gps/geopositioninfo.h \
 -                   gps/geocoordinate.h
 -        CONFIG += link_pkgconfig
 -        PKGCONFIG += glib-2.0 liblocation
 -        LIBS += -llocation
 +        CONFIG += icd2
 +#        SOURCES += gps/gpspositionprivateliblocation.cpp \
 +#                   gps/liblocationwrapper.cpp \
 +#                   gps/geopositioninfo.cpp \
 +#                   gps/geocoordinate.cpp
 +#        HEADERS += gps/gpspositionprivateliblocation.h \
 +#                   gps/liblocationwrapper.h \
 +#                   gps/geopositioninfo.h \
 +#                   gps/geocoordinate.h
 +#        CONFIG += link_pkgconfig
 +#        PKGCONFIG += glib-2.0 liblocation
++#        LIBS += -llocation
 +        SOURCES += gps/gpspositionprivatestub.cpp
 +        HEADERS += gps/gpspositionprivatestub.h
      } else {
          SOURCES += gps/gpspositionprivatestub.cpp \
                     network/networkhandlerprivatestub.cpp

diff --cc src/ui/mainwindow.cpp
Simple merge