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

Change-Id: Ie32717a594ad7a82d1c8eee238ce378bcfadc2ac

7 files changed, 69 insertions, 9 deletions

diff --git a/src/location/configure.json b/src/location/configure.json
index fa29cd77..bf15f0be 100644
--- a/src/location/configure.json
+++ b/src/location/configure.json
@@ -9,7 +9,6 @@
             "label": "Qt.labs.location experimental QML plugin",
             "purpose": "Provides experimental QtLocation QML types",
             "section": "Location",
-            "autoDetect": false,
             "output": [ "privateFeature" ]
         },
         "geoservices_osm": {
diff --git a/src/locationlabs/qlocationlabsglobal_p.h b/src/locationlabs/qlocationlabsglobal_p.h
new file mode 100644
index 00000000..aa965864
--- /dev/null
+++ b/src/locationlabs/qlocationlabsglobal_p.h
@@ -0,0 +1,58 @@
+/****************************************************************************
+**
+** Copyright (C) 2018 The Qt Company Ltd.
+** Contact: http://www.qt.io/licensing/
+**
+** This file is part of the QtLocation module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL3$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see http://www.qt.io/terms-conditions. For further
+** information use the contact form at http://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPLv3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl.html.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or later as published by the Free
+** Software Foundation and appearing in the file LICENSE.GPL included in
+** the packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 2.0 requirements will be
+** met: http://www.gnu.org/licenses/gpl-2.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+#ifndef QLOCATIONLABSGLOBAL_P_H
+#define QLOCATIONLABSGLOBAL_P_H
+
+#include <QtCore/qglobal.h>
+
+QT_BEGIN_NAMESPACE
+
+#ifndef QT_STATIC
+#    if defined(QT_BUILD_LOCATIONLABS_LIB)
+#      define Q_LOCATIONLABS_EXPORT Q_DECL_EXPORT
+#    else
+#      define Q_LOCATIONLABS_EXPORT Q_DECL_IMPORT
+#    endif
+#else
+#    define Q_LOCATIONLABS_EXPORT
+#endif
+
+#define Q_LOCATIONLABS_PRIVATE_EXPORT Q_LOCATIONLABS_EXPORT
+
+QT_END_NAMESPACE
+
+#endif // QLOCATIONLABSGLOBAL_P_H
+
diff --git a/src/locationlabs/qmapobjectview.cpp b/src/locationlabs/qmapobjectview.cpp
index 696b2bce..59db7b95 100644
--- a/src/locationlabs/qmapobjectview.cpp
+++ b/src/locationlabs/qmapobjectview.cpp
@@ -247,12 +247,12 @@ void QMapObjectView::removeMapObject(QGeoMapObject *object)
     }
 }
 
-void QMapObjectView::destroyingItem(QObject */*object*/)
+void QMapObjectView::destroyingItem(QObject * /*object*/)
 {
 
 }
 
-void QMapObjectView::initItem(int /*index*/, QObject */*object*/)
+void QMapObjectView::initItem(int /*index*/, QObject * /*object*/)
 {
 
 }
diff --git a/src/locationlabs/qmapobjectview_p.h b/src/locationlabs/qmapobjectview_p.h
index 80f923fd..cfdc6702 100644
--- a/src/locationlabs/qmapobjectview_p.h
+++ b/src/locationlabs/qmapobjectview_p.h
@@ -48,6 +48,7 @@
 // We mean it.
 //
 
+#include <QtLocationLabs/private/qlocationlabsglobal_p.h>
 #include <QtLocation/private/qgeomapobject_p.h>
 #include <QQmlComponent>
 #include <QVector>
@@ -57,7 +58,7 @@ QT_BEGIN_NAMESPACE
 class QQmlDelegateModel;
 class QMapObjectViewPrivate;
 class QQmlChangeSet;
-class Q_LOCATION_PRIVATE_EXPORT QMapObjectView : public QGeoMapObject
+class Q_LOCATIONLABS_PRIVATE_EXPORT QMapObjectView : public QGeoMapObject
 {
     Q_OBJECT
     Q_PROPERTY(QVariant model READ model WRITE setModel NOTIFY modelChanged)
diff --git a/src/locationlabs/qmapobjectview_p_p.h b/src/locationlabs/qmapobjectview_p_p.h
index bbee557e..5c0cdf82 100644
--- a/src/locationlabs/qmapobjectview_p_p.h
+++ b/src/locationlabs/qmapobjectview_p_p.h
@@ -49,6 +49,7 @@
 // We mean it.
 //
 
+#include <QtLocationLabs/private/qlocationlabsglobal_p.h>
 #include <QtLocation/private/qgeomapobject_p_p.h>
 #include <QPointer>
 #include <QVector>
@@ -58,7 +59,7 @@ QT_BEGIN_NAMESPACE
 
 class QQmlDelegateModel;
 class QGeoMap;
-class Q_LOCATION_PRIVATE_EXPORT QMapObjectViewPrivate : public QGeoMapObjectPrivate
+class Q_LOCATIONLABS_PRIVATE_EXPORT QMapObjectViewPrivate : public QGeoMapObjectPrivate
 {
 public:
     QMapObjectViewPrivate(QGeoMapObject *q);
@@ -67,7 +68,7 @@ public:
     virtual QGeoMapObject::Type type() const override final;
 };
 
-class Q_LOCATION_PRIVATE_EXPORT QMapObjectViewPrivateDefault : public QMapObjectViewPrivate
+class Q_LOCATIONLABS_PRIVATE_EXPORT QMapObjectViewPrivateDefault : public QMapObjectViewPrivate
 {
 public:
     QMapObjectViewPrivateDefault(QGeoMapObject *q);
diff --git a/src/locationlabs/qmaprouteobject_p.h b/src/locationlabs/qmaprouteobject_p.h
index dcc35807..8fca325c 100644
--- a/src/locationlabs/qmaprouteobject_p.h
+++ b/src/locationlabs/qmaprouteobject_p.h
@@ -48,7 +48,7 @@
 // We mean it.
 //
 
-#include <QtLocation/private/qlocationglobal_p.h>
+#include <QtLocationLabs/private/qlocationlabsglobal_p.h>
 #include <QtQml/qqml.h>
 
 #include <QtLocation/private/qgeomapobject_p.h>
@@ -59,7 +59,7 @@ QT_BEGIN_NAMESPACE
 class QDeclarativeGeoRoute;
 class QGeoRoute;
 class QMapRouteObjectPrivate;
-class Q_LOCATION_PRIVATE_EXPORT QMapRouteObject : public QGeoMapObject
+class Q_LOCATIONLABS_PRIVATE_EXPORT QMapRouteObject : public QGeoMapObject
 {
     Q_OBJECT
     Q_PROPERTY(QDeclarativeGeoRoute *route READ route WRITE setRoute NOTIFY routeChanged)
diff --git a/src/locationlabs/qmaprouteobject_p_p.h b/src/locationlabs/qmaprouteobject_p_p.h
index 113f14a0..8dbfc6b4 100644
--- a/src/locationlabs/qmaprouteobject_p_p.h
+++ b/src/locationlabs/qmaprouteobject_p_p.h
@@ -48,13 +48,14 @@
 // We mean it.
 //
 
+#include <QtLocationLabs/private/qlocationlabsglobal_p.h>
 #include <QtLocation/private/qgeomapobject_p_p.h>
 #include <QtLocation/private/qdeclarativegeoroute_p.h>
 QT_BEGIN_NAMESPACE
 
 class QGeoRoute;
 
-class Q_LOCATION_PRIVATE_EXPORT QMapRouteObjectPrivate : public QGeoMapObjectPrivate
+class Q_LOCATIONLABS_PRIVATE_EXPORT QMapRouteObjectPrivate : public QGeoMapObjectPrivate
 {
 public:
     QMapRouteObjectPrivate(QGeoMapObject *q);