Move locationlabs code into location

The labs feature will still be controlled by location-labs-plugin
config option. They will simply come from the QtLocation module, and
be exposed to QML via the additional qml plugin in
imports/locationlabs.

Change-Id: I133d625708e78ba5d8121a95e45142aae5ec274b
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>

26 files changed, 46 insertions, 58 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 1ae5d770..83deb27e 100644
--- a/src/imports/locationlabs/locationlabs.cpp
+++ b/src/imports/locationlabs/locationlabs.cpp
@@ -34,13 +34,12 @@
 **
 ****************************************************************************/
 
-#include <QtLocationLabs/private/qmapiconobject_p.h>
-#include <QtLocationLabs/private/qmapobjectview_p.h>
-#include <QtLocationLabs/private/qmaprouteobject_p.h>
-#include <QtLocationLabs/private/qmapcircleobject_p.h>
-#include <QtLocationLabs/private/qmappolygonobject_p.h>
-#include <QtLocationLabs/private/qmappolylineobject_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 <QtQml/qqmlextensionplugin.h>
 #include <QtQml/qqml.h>
@@ -74,7 +73,6 @@ public:
             int minor = 11;
 
             // Register the 5.11 types
-            //qmlRegisterType<QDeclarativeNavigator>(uri, major, minor, "Navigator");
             qmlRegisterType<QMapIconObject>(uri, major, minor, "MapIconObject");
             qmlRegisterType<QMapObjectView>(uri, major, minor, "MapObjectView");
             qmlRegisterType<QMapRouteObject>(uri, major, minor, "MapRouteObject");
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
diff --git a/src/location/labs/labs.pri b/src/location/labs/labs.pri
new file mode 100644
index 00000000..de2fd820
--- /dev/null
+++ b/src/location/labs/labs.pri
@@ -0,0 +1,4 @@
+INCLUDEPATH += labs
+
+PRIVATE_HEADERS += $$files($$PWD/*.h)
+SOURCES += $$files($$PWD/*.cpp)
diff --git a/src/locationlabs/qmapcircleobject.cpp b/src/location/labs/qmapcircleobject.cpp
index 9d8b14c0..9d8b14c0 100644
--- a/src/locationlabs/qmapcircleobject.cpp
+++ b/src/location/labs/qmapcircleobject.cpp
diff --git a/src/locationlabs/qmapcircleobject_p.h b/src/location/labs/qmapcircleobject_p.h
index 0c050d34..9393047e 100644
--- a/src/locationlabs/qmapcircleobject_p.h
+++ b/src/location/labs/qmapcircleobject_p.h
@@ -48,7 +48,7 @@
 // We mean it.
 //
 
-#include <QtLocationLabs/private/qlocationlabsglobal_p.h>
+#include <QtLocation/private/qlocationglobal_p.h>
 #include <QtLocation/private/qgeomapobject_p.h>
 #include <QtLocation/private/qdeclarativepolylinemapitem_p.h>
 #include <QtCore/QUrl>
@@ -56,7 +56,7 @@
 
 QT_BEGIN_NAMESPACE
 
-class Q_LOCATIONLABS_PRIVATE_EXPORT QMapCircleObject : public QGeoMapObject
+class Q_LOCATION_PRIVATE_EXPORT QMapCircleObject : public QGeoMapObject
 {
     Q_OBJECT
     Q_PROPERTY(QGeoCoordinate center READ center WRITE setCenter NOTIFY centerChanged)
diff --git a/src/locationlabs/qmapcircleobject_p_p.h b/src/location/labs/qmapcircleobject_p_p.h
index 8f237bd6..b3353b62 100644
--- a/src/locationlabs/qmapcircleobject_p_p.h
+++ b/src/location/labs/qmapcircleobject_p_p.h
@@ -48,14 +48,14 @@
 // We mean it.
 //
 
-#include <QtLocationLabs/private/qlocationlabsglobal_p.h>
+#include <QtLocation/private/qlocationglobal_p.h>
 #include <QtLocation/private/qgeomapobject_p_p.h>
 #include <QGeoCoordinate>
 #include <QColor>
 
 QT_BEGIN_NAMESPACE
 
-class Q_LOCATIONLABS_PRIVATE_EXPORT QMapCircleObjectPrivate : public QGeoMapObjectPrivate
+class Q_LOCATION_PRIVATE_EXPORT QMapCircleObjectPrivate : public QGeoMapObjectPrivate
 {
 public:
     QMapCircleObjectPrivate(QGeoMapObject *q);
@@ -79,7 +79,7 @@ public:
 };
 
 
-class Q_LOCATIONLABS_PRIVATE_EXPORT QMapCircleObjectPrivateDefault : public QMapCircleObjectPrivate
+class Q_LOCATION_PRIVATE_EXPORT QMapCircleObjectPrivateDefault : public QMapCircleObjectPrivate
 {
 public:
     QMapCircleObjectPrivateDefault(QGeoMapObject *q);
diff --git a/src/locationlabs/qmapiconobject.cpp b/src/location/labs/qmapiconobject.cpp
index 7a3a1a75..7a3a1a75 100644
--- a/src/locationlabs/qmapiconobject.cpp
+++ b/src/location/labs/qmapiconobject.cpp
diff --git a/src/locationlabs/qmapiconobject_p.h b/src/location/labs/qmapiconobject_p.h
index 4fcef648..16b00d04 100644
--- a/src/locationlabs/qmapiconobject_p.h
+++ b/src/location/labs/qmapiconobject_p.h
@@ -48,7 +48,7 @@
 // We mean it.
 //
 
-#include <QtLocationLabs/private/qlocationlabsglobal_p.h>
+#include <QtLocation/private/qlocationglobal_p.h>
 #include <QtLocation/private/qgeomapobject_p.h>
 #include <QtCore/QUrl>
 #include <QGeoCoordinate>
@@ -56,7 +56,7 @@
 
 QT_BEGIN_NAMESPACE
 
-class Q_LOCATIONLABS_PRIVATE_EXPORT QMapIconObject : public QGeoMapObject
+class Q_LOCATION_PRIVATE_EXPORT QMapIconObject : public QGeoMapObject
 {
     Q_OBJECT
     Q_PROPERTY(QGeoCoordinate coordinate READ coordinate WRITE setCoordinate NOTIFY coordinateChanged)
diff --git a/src/locationlabs/qmapiconobject_p_p.h b/src/location/labs/qmapiconobject_p_p.h
index 7eec58a1..08a1a893 100644
--- a/src/locationlabs/qmapiconobject_p_p.h
+++ b/src/location/labs/qmapiconobject_p_p.h
@@ -48,13 +48,13 @@
 // We mean it.
 //
 
-#include <QtLocationLabs/private/qlocationlabsglobal_p.h>
+#include <QtLocation/private/qlocationglobal_p.h>
 #include <QtLocation/private/qgeomapobject_p_p.h>
 #include <QGeoCoordinate>
 
 QT_BEGIN_NAMESPACE
 
-class Q_LOCATIONLABS_PRIVATE_EXPORT QMapIconObjectPrivate : public QGeoMapObjectPrivate
+class Q_LOCATION_PRIVATE_EXPORT QMapIconObjectPrivate : public QGeoMapObjectPrivate
 {
 public:
     QMapIconObjectPrivate(QGeoMapObject *q);
@@ -73,7 +73,7 @@ public:
     bool equals(const QGeoMapObjectPrivate &other) const override;
 };
 
-class Q_LOCATIONLABS_PRIVATE_EXPORT QMapIconObjectPrivateDefault : public QMapIconObjectPrivate
+class Q_LOCATION_PRIVATE_EXPORT QMapIconObjectPrivateDefault : public QMapIconObjectPrivate
 {
 public:
     QMapIconObjectPrivateDefault(QGeoMapObject *q);
diff --git a/src/locationlabs/qmapobjectview.cpp b/src/location/labs/qmapobjectview.cpp
index 310775a1..310775a1 100644
--- a/src/locationlabs/qmapobjectview.cpp
+++ b/src/location/labs/qmapobjectview.cpp
diff --git a/src/locationlabs/qmapobjectview_p.h b/src/location/labs/qmapobjectview_p.h
index cfdc6702..49b80883 100644
--- a/src/locationlabs/qmapobjectview_p.h
+++ b/src/location/labs/qmapobjectview_p.h
@@ -48,7 +48,7 @@
 // We mean it.
 //
 
-#include <QtLocationLabs/private/qlocationlabsglobal_p.h>
+#include <QtLocation/private/qlocationglobal_p.h>
 #include <QtLocation/private/qgeomapobject_p.h>
 #include <QQmlComponent>
 #include <QVector>
@@ -58,7 +58,7 @@ QT_BEGIN_NAMESPACE
 class QQmlDelegateModel;
 class QMapObjectViewPrivate;
 class QQmlChangeSet;
-class Q_LOCATIONLABS_PRIVATE_EXPORT QMapObjectView : public QGeoMapObject
+class Q_LOCATION_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/location/labs/qmapobjectview_p_p.h
index 5c0cdf82..7550e209 100644
--- a/src/locationlabs/qmapobjectview_p_p.h
+++ b/src/location/labs/qmapobjectview_p_p.h
@@ -49,7 +49,7 @@
 // We mean it.
 //
 
-#include <QtLocationLabs/private/qlocationlabsglobal_p.h>
+#include <QtLocation/private/qlocationglobal_p.h>
 #include <QtLocation/private/qgeomapobject_p_p.h>
 #include <QPointer>
 #include <QVector>
@@ -59,7 +59,7 @@ QT_BEGIN_NAMESPACE
 
 class QQmlDelegateModel;
 class QGeoMap;
-class Q_LOCATIONLABS_PRIVATE_EXPORT QMapObjectViewPrivate : public QGeoMapObjectPrivate
+class Q_LOCATION_PRIVATE_EXPORT QMapObjectViewPrivate : public QGeoMapObjectPrivate
 {
 public:
     QMapObjectViewPrivate(QGeoMapObject *q);
@@ -68,7 +68,7 @@ public:
     virtual QGeoMapObject::Type type() const override final;
 };
 
-class Q_LOCATIONLABS_PRIVATE_EXPORT QMapObjectViewPrivateDefault : public QMapObjectViewPrivate
+class Q_LOCATION_PRIVATE_EXPORT QMapObjectViewPrivateDefault : public QMapObjectViewPrivate
 {
 public:
     QMapObjectViewPrivateDefault(QGeoMapObject *q);
diff --git a/src/locationlabs/qmappolygonobject.cpp b/src/location/labs/qmappolygonobject.cpp
index fd4c660a..fd4c660a 100644
--- a/src/locationlabs/qmappolygonobject.cpp
+++ b/src/location/labs/qmappolygonobject.cpp
diff --git a/src/locationlabs/qmappolygonobject_p.h b/src/location/labs/qmappolygonobject_p.h
index f9fcaad7..03eef587 100644
--- a/src/locationlabs/qmappolygonobject_p.h
+++ b/src/location/labs/qmappolygonobject_p.h
@@ -48,7 +48,7 @@
 // We mean it.
 //
 
-#include <QtLocationLabs/private/qlocationlabsglobal_p.h>
+#include <QtLocation/private/qlocationglobal_p.h>
 #include <QtLocation/private/qgeomapobject_p.h>
 #include <QtLocation/private/qdeclarativepolylinemapitem_p.h>
 
@@ -56,7 +56,7 @@
 
 QT_BEGIN_NAMESPACE
 
-class Q_LOCATIONLABS_PRIVATE_EXPORT QMapPolygonObject : public QGeoMapObject
+class Q_LOCATION_PRIVATE_EXPORT QMapPolygonObject : public QGeoMapObject
 {
     Q_OBJECT
 
diff --git a/src/locationlabs/qmappolygonobject_p_p.h b/src/location/labs/qmappolygonobject_p_p.h
index c2e1eb9c..d7e95d49 100644
--- a/src/locationlabs/qmappolygonobject_p_p.h
+++ b/src/location/labs/qmappolygonobject_p_p.h
@@ -48,14 +48,14 @@
 // We mean it.
 //
 
-#include <QtLocationLabs/private/qlocationlabsglobal_p.h>
+#include <QtLocation/private/qlocationglobal_p.h>
 #include <QtLocation/private/qgeomapobject_p_p.h>
 #include <QGeoCoordinate>
 #include <QColor>
 
 QT_BEGIN_NAMESPACE
 
-class Q_LOCATIONLABS_PRIVATE_EXPORT QMapPolygonObjectPrivate : public QGeoMapObjectPrivate
+class Q_LOCATION_PRIVATE_EXPORT QMapPolygonObjectPrivate : public QGeoMapObjectPrivate
 {
 public:
     QMapPolygonObjectPrivate(QGeoMapObject *q);
@@ -76,7 +76,7 @@ public:
     bool equals(const QGeoMapObjectPrivate &other) const override;
 };
 
-class Q_LOCATIONLABS_PRIVATE_EXPORT QMapPolygonObjectPrivateDefault : public QMapPolygonObjectPrivate
+class Q_LOCATION_PRIVATE_EXPORT QMapPolygonObjectPrivateDefault : public QMapPolygonObjectPrivate
 {
 public:
     QMapPolygonObjectPrivateDefault(QGeoMapObject *q);
diff --git a/src/locationlabs/qmappolylineobject.cpp b/src/location/labs/qmappolylineobject.cpp
index 1e625c1f..1e625c1f 100644
--- a/src/locationlabs/qmappolylineobject.cpp
+++ b/src/location/labs/qmappolylineobject.cpp
diff --git a/src/locationlabs/qmappolylineobject_p.h b/src/location/labs/qmappolylineobject_p.h
index fe844a5c..68312fb8 100644
--- a/src/locationlabs/qmappolylineobject_p.h
+++ b/src/location/labs/qmappolylineobject_p.h
@@ -48,7 +48,7 @@
 // We mean it.
 //
 
-#include <QtLocationLabs/private/qlocationlabsglobal_p.h>
+#include <QtLocation/private/qlocationglobal_p.h>
 #include <QtLocation/private/qgeomapobject_p.h>
 #include <QtLocation/private/qdeclarativepolylinemapitem_p.h>
 
@@ -56,7 +56,7 @@
 
 QT_BEGIN_NAMESPACE
 
-class Q_LOCATIONLABS_PRIVATE_EXPORT QMapPolylineObject : public QGeoMapObject
+class Q_LOCATION_PRIVATE_EXPORT QMapPolylineObject : public QGeoMapObject
 {
     Q_OBJECT
 
diff --git a/src/locationlabs/qmappolylineobject_p_p.h b/src/location/labs/qmappolylineobject_p_p.h
index 80eeb2cd..1d5919d2 100644
--- a/src/locationlabs/qmappolylineobject_p_p.h
+++ b/src/location/labs/qmappolylineobject_p_p.h
@@ -48,14 +48,14 @@
 // We mean it.
 //
 
-#include <QtLocationLabs/private/qlocationlabsglobal_p.h>
+#include <QtLocation/private/qlocationglobal_p.h>
 #include <QtLocation/private/qgeomapobject_p_p.h>
 #include <QGeoCoordinate>
 #include <QColor>
 
 QT_BEGIN_NAMESPACE
 
-class Q_LOCATIONLABS_PRIVATE_EXPORT QMapPolylineObjectPrivate : public QGeoMapObjectPrivate
+class Q_LOCATION_PRIVATE_EXPORT QMapPolylineObjectPrivate : public QGeoMapObjectPrivate
 {
 public:
     QMapPolylineObjectPrivate(QGeoMapObject *q);
@@ -74,7 +74,7 @@ public:
     bool equals(const QGeoMapObjectPrivate &other) const override;
 };
 
-class Q_LOCATIONLABS_PRIVATE_EXPORT QMapPolylineObjectPrivateDefault : public QMapPolylineObjectPrivate
+class Q_LOCATION_PRIVATE_EXPORT QMapPolylineObjectPrivateDefault : public QMapPolylineObjectPrivate
 {
 public:
     QMapPolylineObjectPrivateDefault(QGeoMapObject *q);
diff --git a/src/locationlabs/qmaprouteobject.cpp b/src/location/labs/qmaprouteobject.cpp
index 724bdb73..724bdb73 100644
--- a/src/locationlabs/qmaprouteobject.cpp
+++ b/src/location/labs/qmaprouteobject.cpp
diff --git a/src/locationlabs/qmaprouteobject_p.h b/src/location/labs/qmaprouteobject_p.h
index 8fca325c..dcc35807 100644
--- a/src/locationlabs/qmaprouteobject_p.h
+++ b/src/location/labs/qmaprouteobject_p.h
@@ -48,7 +48,7 @@
 // We mean it.
 //
 
-#include <QtLocationLabs/private/qlocationlabsglobal_p.h>
+#include <QtLocation/private/qlocationglobal_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_LOCATIONLABS_PRIVATE_EXPORT QMapRouteObject : public QGeoMapObject
+class Q_LOCATION_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/location/labs/qmaprouteobject_p_p.h
index 8dbfc6b4..e01b1cc6 100644
--- a/src/locationlabs/qmaprouteobject_p_p.h
+++ b/src/location/labs/qmaprouteobject_p_p.h
@@ -48,14 +48,14 @@
 // We mean it.
 //
 
-#include <QtLocationLabs/private/qlocationlabsglobal_p.h>
+#include <QtLocation/private/qlocationglobal_p.h>
 #include <QtLocation/private/qgeomapobject_p_p.h>
 #include <QtLocation/private/qdeclarativegeoroute_p.h>
 QT_BEGIN_NAMESPACE
 
 class QGeoRoute;
 
-class Q_LOCATIONLABS_PRIVATE_EXPORT QMapRouteObjectPrivate : public QGeoMapObjectPrivate
+class Q_LOCATION_PRIVATE_EXPORT QMapRouteObjectPrivate : public QGeoMapObjectPrivate
 {
 public:
     QMapRouteObjectPrivate(QGeoMapObject *q);
diff --git a/src/location/location.pro b/src/location/location.pro
index 199c5bd2..89c1fdd5 100644
--- a/src/location/location.pro
+++ b/src/location/location.pro
@@ -6,6 +6,7 @@ android {
 }
 
 CONFIG += simd optimize_full
+QT_FOR_CONFIG += location-private
 
 # 3rdparty headers produce warnings with MSVC
 msvc: CONFIG -= warning_clean
@@ -38,6 +39,7 @@ include(maps/maps.pri)
 include(places/places.pri)
 include(declarativemaps/declarativemaps.pri)
 include(declarativeplaces/declarativeplaces.pri)
+qtConfig(location-labs-plugin):include(labs/labs.pri)
 
 HEADERS += $$PUBLIC_HEADERS $$PRIVATE_HEADERS
 
diff --git a/src/locationlabs/locationlabs.pro b/src/locationlabs/locationlabs.pro
deleted file mode 100644
index add700ca..00000000
--- a/src/locationlabs/locationlabs.pro
+++ /dev/null
@@ -1,11 +0,0 @@
-TARGET = QtLocationLabs
-
-QT += core-private gui-private quick-private location-private positioning-private positioningquick-private
-
-CONFIG += simd optimize_full
-
-SOURCES += $$files(*.cpp)
-HEADERS += $$files(*.h)
-
-load(qt_module)
-
diff --git a/src/src.pro b/src/src.pro
index 54fddb62..87ea7983 100644
--- a/src/src.pro
+++ b/src/src.pro
@@ -21,14 +21,8 @@ qtHaveModule(quick) {
 
     plugins.depends += location
 
-    exists(locationlabs):qtConfig(location-labs-plugin) {
-        SUBDIRS += locationlabs
-        locationlabs.depends += location
-    }
-
     SUBDIRS += imports
     imports.depends += positioningquick positioning location
-    exists(locationlabs):qtConfig(location-labs-plugin): imports.depends += locationlabs
 }
 plugins.depends += positioning
 SUBDIRS += plugins
diff --git a/sync.profile b/sync.profile
index 57d89c2b..dcdc7296 100644
--- a/sync.profile
+++ b/sync.profile
@@ -2,7 +2,6 @@
     "QtLocation" => "$basedir/src/location",
     "QtPositioning" => "$basedir/src/positioning",
     "QtPositioningQuick" => "$basedir/src/positioningquick",
-    "QtLocationLabs" => "$basedir/src/locationlabs",
 );
 %moduleheaders = ( # restrict the module headers to those found in relative path
 );