Merge branch 'master' of https://vcs.maemo.org/git/situare
[situare] / src / src.pro
index 132c441..53abef3 100644 (file)
@@ -3,12 +3,11 @@
 # -------------------------------------------------
 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 \
     facebookservice/facebookcredentials.cpp \
@@ -33,7 +32,7 @@ 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 \
@@ -41,9 +40,14 @@ SOURCES += main.cpp \
     gps/gpsposition.cpp \
     map/gpslocationitem.cpp \
     ui/zoombuttonpanel.cpp \
-    ui/userinfo.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 \
@@ -71,7 +75,7 @@ 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 \
@@ -82,20 +86,30 @@ HEADERS += ui/mainwindow.h \
     gps/gpscommon.h \
     ui/zoombuttonpanel.h \
     common.h \
-    ui/userinfo.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
 
-DEFINES += QT_NO_DEBUG_OUTPUT
-
-!maemo5 {
-    SOURCES += gps/gpspositionprivatestub.cpp
-    HEADERS += gps/gpspositionprivatestub.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 | 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
@@ -110,9 +124,16 @@ maemo5 {
     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
 # -----------------------------------------------------------------