Merge branch 'master' into map_double_click_zoom

[situare] / src / src.pro

diff --git a/src/src.pro b/src/src.pro
index 253e1a6..d1377cd 100644 (file)
--- a/src/src.pro
+++ b/src/src.pro
@@ -21,6 +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 @@ SOURCES += main.cpp \
     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 @@ HEADERS += common.h \
     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 @@ HEADERS += common.h \
     ui/zoombutton.h \
     ui/zoombuttonpanel.h \
     user/user.h \
-    map/mapscroller.h \
     ui/fullscreenbutton.h
 QT += network \
     webkit
@@ -133,6 +133,7 @@ simulator {
 #                   gps/geocoordinate.h
 #        CONFIG += link_pkgconfig
 #        PKGCONFIG += glib-2.0 liblocation
+#        LIBS += -llocation
         SOURCES += gps/gpspositionprivatestub.cpp
         HEADERS += gps/gpspositionprivatestub.h
     } else {