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 4c172f6..53abef3 100644 (file)
--- a/src/src.pro
+++ b/src/src.pro
@@ -45,6 +45,7 @@ SOURCES += main.cpp \
     ui/zoombutton.cpp \
     network/networkaccessmanager.cpp \
     network/networkhandler.cpp \
+    network/networkcookiejar.cpp \
     network/networkreply.cpp
 HEADERS += ui/mainwindow.h \
     map/mapengine.h \
@@ -90,24 +91,25 @@ HEADERS += ui/mainwindow.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 {
-    sbox | simulator {
-        DEFINES += SBOX
-        SOURCES += network/networkhandlerprivatestub.cpp
-        HEADERS += network/networkhandlerprivatestub.h
-    } else {
+    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