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 d6fe687..53abef3 100644 (file)
--- a/src/src.pro
+++ b/src/src.pro
@@ -3,10 +3,8 @@
 # -------------------------------------------------
 TARGET = ../situare
 TEMPLATE = app
-INCLUDEPATH += /usr/include/qjson /usr/include/glib-2.0 /usr/lib/glib-2.0/include
+INCLUDEPATH += /usr/include/qjson
 LIBS += -lqjson
-CONFIG += icd2
-QT += dbus
 RESOURCES += ../images.qrc
 SOURCES += main.cpp \
     ui/mainwindow.cpp \
@@ -43,11 +41,12 @@ SOURCES += main.cpp \
     map/gpslocationitem.cpp \
     ui/zoombuttonpanel.cpp \
     ui/userinfo.cpp \
-    engine/networkhandler.cpp \
     ui/sidepanel.cpp \
-    engine/networkaccessmanager.cpp \
-    engine/networkreply.cpp \
-    ui/zoombutton.cpp
+    ui/zoombutton.cpp \
+    network/networkaccessmanager.cpp \
+    network/networkhandler.cpp \
+    network/networkcookiejar.cpp \
+    network/networkreply.cpp
 HEADERS += ui/mainwindow.h \
     map/mapengine.h \
     map/mapview.h \
@@ -88,17 +87,29 @@ HEADERS += ui/mainwindow.h \
     ui/zoombuttonpanel.h \
     common.h \
     ui/userinfo.h \
-    engine/networkhandler.h \
     ui/sidepanel.h \
-    engine/networkaccessmanager.h \
-    engine/networkreply.h \
-    ui/zoombutton.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 | 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
@@ -114,8 +125,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)