Merge branch 'master' into cookies_refactored

[situare] / src / src.pro

diff --git a/src/src.pro b/src/src.pro
index 4eedcad..fe92caf 100644 (file)
--- a/src/src.pro
+++ b/src/src.pro
@@ -3,8 +3,8 @@
 # -------------------------------------------------
 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 \
@@ -43,7 +43,11 @@ SOURCES += main.cpp \
     ui/userinfo.cpp \
     ui/sidepanel.cpp \
     networkcookiejar.cpp \
-    ui/zoombutton.cpp
+    ui/zoombutton.cpp \
+    ui/zoombutton.cpp \
+    network/networkaccessmanager.cpp \
+    network/networkhandler.cpp \
+    network/networkreply.cpp
 HEADERS += ui/mainwindow.h \
     map/mapengine.h \
     map/mapview.h \
@@ -86,16 +90,23 @@ HEADERS += ui/mainwindow.h \
     ui/userinfo.h \
     ui/sidepanel.h \
     networkcookiejar.h \
-    ui/zoombutton.h
+    ui/zoombutton.h \
+    network/networkaccessmanager.h \
+    network/networkhandler.h \
+    network/networkreply.h
 QT += network \
     webkit
-#DEFINES += QT_NO_DEBUG_OUTPUT
+
+DEFINES += QT_NO_DEBUG_OUTPUT
 
 maemo5 | simulator {
-    SOURCES += gps/gpspositionprivate.cpp
-    HEADERS += gps/gpspositionprivate.h
-    QT += maemo5
-    CONFIG += mobility
+    INCLUDEPATH += /usr/include/glib-2.0 /usr/lib/glib-2.0/include
+    SOURCES += gps/gpspositionprivate.cpp \
+               network/networkhandlerprivate.cpp
+    HEADERS += gps/gpspositionprivate.h \
+               network/networkhandlerprivate.h
+    QT += maemo5 dbus
+    CONFIG += mobility icd2
     MOBILITY = location
     message([QJson])
     message(Make sure you have QJson development headers installed)
@@ -107,8 +118,10 @@ maemo5 | simulator {
     message(Make sure you have QtMobility development headers installed)
     message(install headers with: apt-get install libqtm-dev)
 } else {
-    SOURCES += gps/gpspositionprivatestub.cpp
-    HEADERS += gps/gpspositionprivatestub.h
+    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)