Merge branch 'master' into scalable_panels

Conflicts:
	src/map/baselocationitem.h

diff --cc src/map/baselocationitem.h
index 2cf2c7a,ed85f74..bf410aa
--- 1/src/map/baselocationitem.h
--- 2/src/map/baselocationitem.h
+++ b/src/map/baselocationitem.h
@@@ -37,11 -37,11 +37,11 @@@ class BaseLocationItem : public QGraphi
  
  public:
      /**
--    * @brief Constructor of BaseLocationItem.
--    *        Sets parent.
--    *
--    * @param parent
--    */
++     * @brief Constructor of BaseLocationItem.
++     *        Sets parent.
++     *
++     * @param parent
++     */
      BaseLocationItem(QObject *parent = 0);
  
  /*******************************************************************************
@@@ -49,19 -49,15 +49,15 @@@
   ******************************************************************************/
  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.
 -    *
 -    * @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
 +     *
 +     * 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
 +     */
      QRect sceneTransformedBoundingRect(int zoomLevel) const;
  };
  

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