Merge branch 'map' of https://vcs.maemo.org/git/situare into map

Conflicts:
	src/src.pro

diff --cc src/map/mapcommon.h
Simple merge

diff --cc src/map/mapfetcher.cpp
Simple merge

diff --cc src/src.pro
index 51286ab,c0c920b..f2606f4
--- 1/src/src.pro
--- 2/src/src.pro
+++ b/src/src.pro
@@@ -47,6 -61,28 +61,22 @@@ HEADERS += ui/mainwindow.h 
  QT += network \
      webkit
  
 -# use don't use OpenGL when building in scratchbox
+ !maemo5 { 
 -    QT += opengl
 -    message(OpenGL built in)
 -    message(Make sure you have OpenGL development headers installed)
 -    message(install headers with: sudo apt-get install libgl-dev libglu-dev)
 -
+     message(QJson built in)
+     message(Make sure you have QJson development headers installed)
+     message(install headers with: sudo apt-get install libqjson-dev)
+ }
+ 
+ maemo5 {
+     message(QJson built in)
+     message(Make sure you have QJson development headers installed)
+     message(add: deb http://repository.maemo.org/extras-devel fremantle free non-free)
+     message(and deb-src http://repository.maemo.org/extras-devel fremantle free non-free)
+     message(to scratchbox's sources.list in /etc/apt)
+     message(run: apt-get update)
+     message(install headers with: apt-get install libqjson-dev)
+ }
+ 
  # -----------------------------------------------------------------
  # Debian packetizing additions
  # -----------------------------------------------------------------

diff --cc src/ui/mapviewscreen.cpp
Simple merge