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

1 files changed, 86 insertions, 0 deletions

diff --git a/src/location/labs/qmapobjectview_p_p.h b/src/location/labs/qmapobjectview_p_p.h
new file mode 100644
index 00000000..7550e209
--- /dev/null
+++ b/src/location/labs/qmapobjectview_p_p.h
@@ -0,0 +1,86 @@
+/****************************************************************************
+**
+** Copyright (C) 2017 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 QMAPOBJECTVIEW_P_P_H
+#define QMAPOBJECTVIEW_P_P_H
+
+
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
+#include <QtLocation/private/qlocationglobal_p.h>
+#include <QtLocation/private/qgeomapobject_p_p.h>
+#include <QPointer>
+#include <QVector>
+#include <QQmlComponent>
+
+QT_BEGIN_NAMESPACE
+
+class QQmlDelegateModel;
+class QGeoMap;
+class Q_LOCATION_PRIVATE_EXPORT QMapObjectViewPrivate : public QGeoMapObjectPrivate
+{
+public:
+    QMapObjectViewPrivate(QGeoMapObject *q);
+    ~QMapObjectViewPrivate() override;
+
+    virtual QGeoMapObject::Type type() const override final;
+};
+
+class Q_LOCATION_PRIVATE_EXPORT QMapObjectViewPrivateDefault : public QMapObjectViewPrivate
+{
+public:
+    QMapObjectViewPrivateDefault(QGeoMapObject *q);
+    QMapObjectViewPrivateDefault(const QMapObjectViewPrivate &other);
+    ~QMapObjectViewPrivateDefault() override;
+
+
+    // QGeoMapObjectPrivate interface
+public:
+    QGeoMapObjectPrivate *clone() override;
+};
+
+QT_END_NAMESPACE
+
+#endif // QMAPOBJECTVIEW_P_P_H