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

* 'master' of scm.dev.nokia.troll.no:qtmobility/qtm-serviceframework:
  Make it very obvious that old 1.1 based Map elements are gone.

2 files changed, 12 insertions, 0 deletions

diff --git a/doc/src/plugins/qml-location.qdoc b/doc/src/plugins/qml-location.qdoc
index a43489ac83..44afc7b4d2 100644
--- a/doc/src/plugins/qml-location.qdoc
+++ b/doc/src/plugins/qml-location.qdoc
@@ -87,6 +87,15 @@
 
     \section2 Map Elements
 
+    While the Maps elements were already available as an early preview in QtMobility 1.1
+    the elements received considerable API and behavior changes in QtMobility 1.2. Therefore
+    the elements are \bold{no longer available as 1.1 import}. QML applications \bold{have to change}
+    their import statement to 1.2. Applications using any Map element in QtMobility 1.2
+    via a QML 1.1 import will fail to work.
+
+    Applications wanting to target QtMobility 1.1 and 1.2 at the same time must deploy
+    two different QML import statements based on the QtMobility version being used.
+
     \annotatedlist qml-location-maps
 
     \section1 Landmarks
diff --git a/plugins/declarative/location/qdeclarativegraphicsgeomap.cpp b/plugins/declarative/location/qdeclarativegraphicsgeomap.cpp
index 4281027877..d4c67b7d62 100644
--- a/plugins/declarative/location/qdeclarativegraphicsgeomap.cpp
+++ b/plugins/declarative/location/qdeclarativegraphicsgeomap.cpp
@@ -100,6 +100,9 @@ QTM_BEGIN_NAMESPACE
     MapObjects or the Map item itself.
 
     The Map element is part of the \bold{QtMobility.location 1.2} module.
+
+    \bold{API break notice:} Any previous \code import QtMobility.location 1.1 \endcode statement
+    for Maps elements will no longer work since QtMobility 1.2.
 */
 QDeclarativeGraphicsGeoMap::QDeclarativeGraphicsGeoMap(QDeclarativeItem *parent)
     : QDeclarativeItem(parent),