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

[situare] / src / src.pro

diff --git a/src/src.pro b/src/src.pro
index 5183ea6..53abef3 100644 (file)
--- a/src/src.pro
+++ b/src/src.pro
@@ -3,15 +3,13 @@
 # -------------------------------------------------
 TARGET = ../situare
 TEMPLATE = app
-INCLUDEPATH += "/usr/include/qjson"
-LIBS += "-lqjson"
+INCLUDEPATH += /usr/include/qjson
+LIBS += -lqjson
 RESOURCES += ../images.qrc
 SOURCES += main.cpp \
     ui/mainwindow.cpp \
-    ui/mapviewscreen.cpp \
     situareservice/situareservice.cpp \
     situareservice/imagefetcher.cpp \
-    cookiehandler/cookiehandler.cpp \
     facebookservice/facebookcredentials.cpp \
     facebookservice/facebookauthentication.cpp \
     map/mapengine.cpp \
@@ -19,8 +17,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 \
@@ -36,22 +32,28 @@ SOURCES += main.cpp \
     map/maptilerequest.cpp \
     ui/imagebutton.cpp \
     ui/friendlistpanel.cpp \
-    ui/userpanel.cpp \
+    ui/userinfopanel.cpp \
     ui/panelsidebar.cpp \
     ui/panelsliderbar.cpp \
     map/friendgroupitem.cpp \
     map/frienditemshandler.cpp \
-    ui/userinfo.cpp
+    gps/gpsposition.cpp \
+    map/gpslocationitem.cpp \
+    ui/zoombuttonpanel.cpp \
+    ui/userinfo.cpp \
+    ui/sidepanel.cpp \
+    ui/zoombutton.cpp \
+    network/networkaccessmanager.cpp \
+    network/networkhandler.cpp \
+    network/networkcookiejar.cpp \
+    network/networkreply.cpp
 HEADERS += ui/mainwindow.h \
-    ui/mapviewscreen.h \
     map/mapengine.h \
     map/mapview.h \
     map/mapscene.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 +62,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 \
@@ -74,35 +75,69 @@ HEADERS += ui/mainwindow.h \
     map/maptilerequest.h \
     ui/imagebutton.h \
     ui/friendlistpanel.h \
-    ui/userpanel.h \
+    ui/userinfopanel.h \
     ui/panelcommon.h \
     ui/panelsidebar.h \
     ui/panelsliderbar.h \
     map/friendgroupitem.h \
     map/frienditemshandler.h \
-    ui/userinfo.h
+    gps/gpsposition.h \
+    map/gpslocationitem.h \
+    gps/gpscommon.h \
+    ui/zoombuttonpanel.h \
+    common.h \
+    ui/userinfo.h \
+    ui/sidepanel.h \
+    ui/zoombutton.h \
+    network/networkaccessmanager.h \
+    network/networkhandler.h \
+    network/networkcookiejar.h \
+    network/networkreply.h
 QT += network \
     webkit
 #DEFINES += QT_NO_DEBUG_OUTPUT
-!maemo5 { 
-    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 | simulator {
+    armel {
+        DEFINES += ARMEL
+        INCLUDEPATH += /usr/include/glib-2.0 /usr/lib/glib-2.0/include
+        SOURCES += network/networkhandlerprivate.cpp
+        HEADERS += network/networkhandlerprivate.h
+        QT += dbus
+        CONFIG += icd2
+    }
+    else {
+        SOURCES += network/networkhandlerprivatestub.cpp
+        HEADERS += network/networkhandlerprivatestub.h
+    }
+    SOURCES += gps/gpspositionprivate.cpp
+    HEADERS += gps/gpspositionprivate.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)
+} else {
+    SOURCES += gps/gpspositionprivatestub.cpp \
+               network/networkhandlerprivatestub.cpp
+    HEADERS += gps/gpspositionprivatestub.h \
+               network/networkhandlerprivatestub.h
+    message(QJson built in)
+    message(Make sure you have QJson development headers installed)
+    message(install headers with: sudo apt-get install libqjson-dev)
 }
 
 # -----------------------------------------------------------------
 # Debian packetizing additions
 # -----------------------------------------------------------------
-unix { 
+unix {
     # VARIABLES
     isEmpty(PREFIX):PREFIX = /usr
     BINDIR = $$PREFIX/bin