Merge branch 'master' of https://vcs.maemo.org/git/situare

diff --combined src/src.pro
index 45c54d2,5ecf933..9f5825e
--- 1/src/src.pro
--- 2/src/src.pro
+++ b/src/src.pro
@@@ -21,6 -21,7 +21,7 @@@ SOURCES += main.cpp 
      map/mapengine.cpp \
      map/mapfetcher.cpp \
      map/mapscene.cpp \
+     map/mapscroller.cpp \
      map/maptile.cpp \
      map/maptilerequest.cpp \
      map/mapview.cpp \
@@@ -51,7 -52,6 +52,6 @@@
      ui/zoombutton.cpp \
      ui/zoombuttonpanel.cpp \
      user/user.cpp \
-     map/mapscroller.cpp \
      ui/fullscreenbutton.cpp
  HEADERS += common.h \
      engine/engine.h \
@@@ -69,6 -69,7 +69,7 @@@
      map/mapengine.h \
      map/mapfetcher.h \
      map/mapscene.h \
+     map/mapscroller.h \
      map/maptile.h \
      map/maptilerequest.h \
      map/mapview.h \
@@@ -101,7 -102,6 +102,6 @@@
      ui/zoombutton.h \
      ui/zoombuttonpanel.h \
      user/user.h \
-     map/mapscroller.h \
      ui/fullscreenbutton.h
  QT += network \
      webkit
@@@ -122,7 -122,7 +122,7 @@@ simulator 
          SOURCES += network/networkhandlerprivate.cpp
          HEADERS += network/networkhandlerprivate.h
          QT += dbus
 -        CONFIG += icd2
 +        CONFIG += icd2 qdbus
          SOURCES += gps/gpspositionprivateliblocation.cpp \
                     gps/liblocationwrapper.cpp \
                     gps/geopositioninfo.cpp \
@@@ -133,7 -133,6 +133,7 @@@
                     gps/geocoordinate.h
          CONFIG += link_pkgconfig
          PKGCONFIG += glib-2.0 liblocation
 +        LIBS += -llocation
      } else {
          SOURCES += gps/gpspositionprivatestub.cpp \
                     network/networkhandlerprivatestub.cpp