Merge branch 'master' of scm.dev.nokia.troll.no:qtmobility/qtm-location into master-integration

* 'master' of scm.dev.nokia.troll.no:qtmobility/qtm-location: (26 commits)
  Fix wrong license header in Maps plug-in
  Added final China URLs.
  remove second watermark image
  add app_id support
  fix logo position for bottom.left and bottom.right parameters
  replace china DNS by IP address for tile service. (temporary solution)
  Updated to version 2.0 of the search server.
  sent new logo images (provided by JS team)
  set better font size
  nokia plugin: add search china url for shifting
  nokia plugin: add service disabled for china simcrads
  Copyright font changed
  switch logo image depending on map type
  Switch to Chinese tile provider when Chinese sim card is present.
  change logo image and position
  fix host value for copyright and service info URL
  remove trailing white-spaces
  add possibility to specify logo position from command-line
  fix language parameter for route service
  change set up copyright size and style for better look
  ...

1 files changed, 7 insertions, 1 deletions

diff --git a/tests/manual/location-testing-tools/mapviewer/mapbox.cpp b/tests/manual/location-testing-tools/mapviewer/mapbox.cpp
index 569a14434d..8afc7f8e61 100644
--- a/tests/manual/location-testing-tools/mapviewer/mapbox.cpp
+++ b/tests/manual/location-testing-tools/mapviewer/mapbox.cpp
@@ -40,6 +40,7 @@
 
 #include "mapbox.h"
 #include "geomap.h"
+#include "mainwindow.h"
 
 #include <qgeoserviceprovider.h>
 #include <qgeomappingmanager.h>
@@ -73,7 +74,7 @@
 #include <QSignalMapper>
 #include <QLabel>
 
-MapBox::MapBox(QWidget * parent) :
+MapBox::MapBox(MainWindow * parent) :
     QWidget(parent),
     m_qgv(0),
     m_scene(0),
@@ -86,6 +87,11 @@ MapBox::MapBox(QWidget * parent) :
     m_displayMode(DisplayNone),
     m_optionsWidget(0)
 {
+    for (QVariantHash::const_iterator it = parent->programOptions().begin(); it != parent->programOptions().end(); ++it)
+    {
+        m_parameters.insert(it.key(), it.value());
+    }
+
     m_scene = new QGraphicsScene(this);
 
     m_qgv = new QGraphicsView(m_scene, this);