Merge branch 'bigger_images'

[situare] / src / src.pro

diff --git a/src/src.pro b/src/src.pro
index 5a7ba41..3890c1f 100644 (file)
--- a/src/src.pro
+++ b/src/src.pro
@@ -42,10 +42,10 @@ SOURCES += main.cpp \
     ui/zoombuttonpanel.cpp \
     ui/userinfo.cpp \
     ui/sidepanel.cpp \
-    networkcookiejar.cpp \
     ui/zoombutton.cpp \
     network/networkaccessmanager.cpp \
     network/networkhandler.cpp \
+    network/networkcookiejar.cpp \
     network/networkreply.cpp
 HEADERS += ui/mainwindow.h \
     map/mapengine.h \
@@ -88,24 +88,31 @@ HEADERS += ui/mainwindow.h \
     common.h \
     ui/userinfo.h \
     ui/sidepanel.h \
-    networkcookiejar.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 | simulator {
-    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
+    sbox | simulator {
+        DEFINES += SBOX
+        SOURCES += network/networkhandlerprivatestub.cpp
+        HEADERS += network/networkhandlerprivatestub.h
+    } else {
+        INCLUDEPATH += /usr/include/glib-2.0 /usr/lib/glib-2.0/include
+        SOURCES += network/networkhandlerprivate.cpp
+        HEADERS += network/networkhandlerprivate.h
+        QT += dbus
+        CONFIG += icd2
+    }
+    SOURCES += gps/gpspositionprivate.cpp
+    HEADERS += gps/gpspositionprivate.h
+    QT += maemo5
+    CONFIG += mobility
     MOBILITY = location
     message([QJson])
     message(Make sure you have QJson development headers installed)