Merge remote-tracking branch 'origin/wip/navigation' into 5.11

 Conflicts:
	src/location/declarativemaps/qgeomapobject.cpp
	src/location/declarativemaps/qgeomapobject_p_p.h
	src/plugins/geoservices/itemsoverlay/qgeomapitemsoverlay.h

Change-Id: Iab847e16011b2095d307e2a3610bf9157ae7b92d

3 files changed, 20 insertions, 12 deletions

diff --git a/src/imports/imports.pro b/src/imports/imports.pro
index 2fd8dbd0..b640c791 100644
--- a/src/imports/imports.pro
+++ b/src/imports/imports.pro
@@ -1,5 +1,7 @@
 TEMPLATE = subdirs
 
-qtHaveModule(positioning): SUBDIRS += positioning
+QT_FOR_CONFIG += location-private
+
+qtHaveModule(positioningquick): SUBDIRS += positioning
 qtHaveModule(location): SUBDIRS += location
-qtHaveModule(locationlabs): SUBDIRS += locationlabs
+qtHaveModule(location):qtConfig(location-labs-plugin): SUBDIRS += locationlabs
diff --git a/src/imports/locationlabs/locationlabs.cpp b/src/imports/locationlabs/locationlabs.cpp
index 4b77a2ae..56924b80 100644
--- a/src/imports/locationlabs/locationlabs.cpp
+++ b/src/imports/locationlabs/locationlabs.cpp
@@ -34,10 +34,13 @@
 **
 ****************************************************************************/
 
-//#include <QtLocationLabs/private/qmapiconobject_p.h>
-#include <QtLocationLabs/private/qmapobjectview_p.h>
-#include <QtLocationLabs/private/qmaprouteobject_p.h>
-//#include <QtLocationLabs/private/qdeclarativenavigator_p.h>
+#include <QtLocation/private/qmapiconobject_p.h>
+#include <QtLocation/private/qmapobjectview_p.h>
+#include <QtLocation/private/qmaprouteobject_p.h>
+#include <QtLocation/private/qmapcircleobject_p.h>
+#include <QtLocation/private/qmappolygonobject_p.h>
+#include <QtLocation/private/qmappolylineobject_p.h>
+#include <QtLocation/private/qdeclarativenavigator_p.h>
 
 #include <QtQml/qqmlextensionplugin.h>
 #include <QtQml/qqml.h>
@@ -67,14 +70,17 @@ public:
         if (QLatin1String(uri) == QLatin1String("Qt.labs.location")) {
 
             // @uri QtLocationLabs
-            int major = 5;
-            int minor = 11;
+            int major = 1;
+            int minor = 0;
 
-            // Register the 5.11 types
-//            qmlRegisterType<QDeclarativeNavigator>(uri, major, minor, "Navigator");
-//            qmlRegisterType<QMapIconObject>(uri, major, minor, "MapIconObject");
+            // Register the 1.0 labs types
+            qmlRegisterType<QMapIconObject>(uri, major, minor, "MapIconObject");
             qmlRegisterType<QMapObjectView>(uri, major, minor, "MapObjectView");
             qmlRegisterType<QMapRouteObject>(uri, major, minor, "MapRouteObject");
+            qmlRegisterType<QMapCircleObject>(uri, major, minor, "MapCircleObject");
+            qmlRegisterType<QMapPolygonObject>(uri, major, minor, "MapPolygonObject");
+            qmlRegisterType<QMapPolylineObject>(uri, major, minor, "MapPolylineObject");
+            qmlRegisterType<QDeclarativeNavigator>(uri, major, minor, "Navigator");
 
             // Register the latest Qt version as QML type version
             qmlRegisterModule(uri, QT_VERSION_MAJOR, QT_VERSION_MINOR);
diff --git a/src/imports/locationlabs/locationlabs.pro b/src/imports/locationlabs/locationlabs.pro
index 618e1492..db7f5ec2 100644
--- a/src/imports/locationlabs/locationlabs.pro
+++ b/src/imports/locationlabs/locationlabs.pro
@@ -1,4 +1,4 @@
-QT += quick-private network positioning-private location-private locationlabs-private qml-private core-private gui-private
+QT += quick-private network positioning-private location-private qml-private core-private gui-private
 
 TARGET = locationlabsplugin
 CXX_MODULE = $$TARGET