Merge branch 'master' into userinfo

[situare] / src / src.pro

diff --git a/src/src.pro b/src/src.pro
index 38a0d82..9e80663 100644 (file)
--- a/src/src.pro
+++ b/src/src.pro
@@ -11,7 +11,6 @@ SOURCES += main.cpp \
     ui/mapviewscreen.cpp \
     situareservice/situareservice.cpp \
     situareservice/imagefetcher.cpp \
-    cookiehandler/cookiehandler.cpp \
     facebookservice/facebookcredentials.cpp \
     facebookservice/facebookauthentication.cpp \
     map/mapengine.cpp \
@@ -19,8 +18,6 @@ SOURCES += main.cpp \
     map/mapscene.cpp \
     map/maptile.cpp \
     map/mapfetcher.cpp \
-    map/mapzoompanel.cpp \
-    map/mapbutton.cpp \
     map/ownlocationitem.cpp \
     map/baselocationitem.cpp \
     map/friendlocationitem.cpp \
@@ -41,6 +38,8 @@ SOURCES += main.cpp \
     ui/panelsliderbar.cpp \
     map/friendgroupitem.cpp \
     map/frienditemshandler.cpp \
+    gps/gpspositioninterface.cpp \
+    ui/zoombuttonpanel.cpp \
     ui/userinfo.cpp
 HEADERS += ui/mainwindow.h \
     ui/mapviewscreen.h \
@@ -50,8 +49,6 @@ HEADERS += ui/mainwindow.h \
     map/maptile.h \
     map/mapfetcher.h \
     map/mapcommon.h \
-    map/mapzoompanel.h \
-    map/mapbutton.h \
     map/ownlocationitem.h \
     map/baselocationitem.h \
     map/friendlocationitem.h \
@@ -60,7 +57,6 @@ HEADERS += ui/mainwindow.h \
     situareservice/situareservice.h \
     situareservice/situarecommon.h \
     situareservice/imagefetcher.h \
-    cookiehandler/cookiehandler.h \
     facebookservice/facebookcredentials.h \
     facebookservice/facebookauthentication.h \
     facebookservice/facebookcommon.h \
@@ -80,30 +76,44 @@ HEADERS += ui/mainwindow.h \
     ui/panelsliderbar.h \
     map/friendgroupitem.h \
     map/frienditemshandler.h \
+    gps/gpspositioninterface.h \
+    ui/zoombuttonpanel.h \
+    situarecommon.h \
     ui/userinfo.h
 QT += network \
     webkit
 
-# DEFINES += QT_NO_DEBUG_OUTPUT
-!maemo5 { 
+#DEFINES += QT_NO_DEBUG_OUTPUT
+
+!maemo5 {
+    SOURCES += gps/gpspositionmockup.cpp
+    HEADERS += gps/gpspositionmockup.h
     message(QJson built in)
     message(Make sure you have QJson development headers installed)
     message(install headers with: sudo apt-get install libqjson-dev)
 }
-maemo5 { 
+maemo5 {
+    SOURCES += gps/gpsposition.cpp
+    HEADERS += gps/gpsposition.h
     QT += maemo5
-    message(QJson built in)
+    CONFIG += mobility
+    MOBILITY = location
+    message([QJson])
     message(Make sure you have QJson development headers installed)
     message(add: deb http://repository.maemo.org/extras-devel fremantle free non-free)
-    message(to scratchbox's sources.list in /etc/apt)
+    message(to Scratchbox's sources.list in /etc/apt)
     message(run: apt-get update)
     message(install headers with: apt-get install libqjson-dev)
+    message([QtMobility])
+    message(Make sure you have QtMobility development headers installed)
+    message(install headers with: apt-get install libqtm-dev)
 }
 
+
 # -----------------------------------------------------------------
 # Debian packetizing additions
 # -----------------------------------------------------------------
-unix { 
+unix {
     # VARIABLES
     isEmpty(PREFIX):PREFIX = /usr
     BINDIR = $$PREFIX/bin