Merge branch 'bigger_images'

diff --cc src/situareservice/situareservice.cpp
Simple merge

diff --cc src/src.pro
index 266e124,348aec1..3890c1f
--- 1/src/src.pro
--- 2/src/src.pro
+++ b/src/src.pro
@@@ -88,27 -84,12 +88,27 @@@ HEADERS += ui/mainwindow.h 
      common.h \
      ui/userinfo.h \
      ui/sidepanel.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 {
 +    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