Merge branch 'master' into pan_map

Conflicts:
	src/map/baselocationitem.h

Reviewed by Jussi Laitinen

diff --cc src/map/baselocationitem.h
index 319f102,0de62fe..821ae7b
--- 1/src/map/baselocationitem.h
--- 2/src/map/baselocationitem.h
+++ b/src/map/baselocationitem.h
@@@ -49,19 -49,15 +49,19 @@@ public
   ******************************************************************************/
  public:
      /**
-       *@brief Return item sceneBoundingRect transformed to given zoom level
-       *
-       * Because of using ItemIgnoresTransformations, and not scaling the item, the default
-       * sceneBoundingRect does always return the lowest map tile level scene bounding rect which
-       * is scaled to current zoom level.
-       *
-       * Left side of the returned rect is always inside the world coordinates, so collision
-       * detection based on this rect does work also when items are spanned outside the
-       * world coordinates.
-       *
-       * @param zoomLevel Zoom level for which the sceneBoundingRect should be transformed
-       * @return sceneBoundingRect transformed to given zoom level
-       */
 -    *@brief Return item sceneBoundingRect transformed to given zoom level
++    * @brief Return item sceneBoundingRect transformed to given zoom level
+     *
+     * Because of using ItemIgnoresTransformations, and not scaling the item, the default
+     * sceneBoundingRect does always return the lowest map tile level scene bounding rect which
 -    * must be scaled to current zoom level.
++    * is scaled to current zoom level.
++    *
++    * Left side of the returned rect is always inside the world coordinates, so collision
++    * detection based on this rect does work also when items are spanned outside the
++    * world coordinates.
+     *
+     * @param zoomLevel Zoom level for which the sceneBoundingRect should be transformed
+     * @return sceneBoundingRect transformed to given zoom level
+     */
      QRect sceneTransformedBoundingRect(int zoomLevel) const;
  };
  

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

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

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

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