diff --git a/src/imports/imports.pro b/src/imports/imports.pro index 2fd8dbd06f9f060707b3382849a0971601e6ada7..b640c791fddf21fb3633e076078342a442c167dc 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 1ae5d770bd162b3ce8adfcef151bff52293e4935..83deb27e11af01b0f5a40e59e18ea23d8b56d063 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 618e14921941067e48c50f1c12627cc0e2199cd4..db7f5ec2fddba5183eb6a69acc19e573b2280ce8 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 0000000000000000000000000000000000000000..de2fd8202a7f0d98e56c207bc4d479e22d0fec2c --- /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 similarity index 100% rename from src/locationlabs/qmapcircleobject.cpp rename to src/location/labs/qmapcircleobject.cpp diff --git a/src/locationlabs/qmapcircleobject_p.h b/src/location/labs/qmapcircleobject_p.h similarity index 95% rename from src/locationlabs/qmapcircleobject_p.h rename to src/location/labs/qmapcircleobject_p.h index 0c050d34788e25ce88b408e056520a27f3cadcef..9393047e12db7dc65786080f57c947d3c35d5276 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 similarity index 94% rename from src/locationlabs/qmapcircleobject_p_p.h rename to src/location/labs/qmapcircleobject_p_p.h index 8f237bd67829d3998320694c957d925224618fc3..b3353b6294201a798acf08c26f70a9e01f199950 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 similarity index 100% rename from src/locationlabs/qmapiconobject.cpp rename to src/location/labs/qmapiconobject.cpp diff --git a/src/locationlabs/qmapiconobject_p.h b/src/location/labs/qmapiconobject_p.h similarity index 95% rename from src/locationlabs/qmapiconobject_p.h rename to src/location/labs/qmapiconobject_p.h index 4fcef648cd42a2eaa1f44e05695f27a199d9838f..16b00d044bb9e52bfc8f843d53a86a8f24445357 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 similarity index 93% rename from src/locationlabs/qmapiconobject_p_p.h rename to src/location/labs/qmapiconobject_p_p.h index 7eec58a1f318f632910efad12ff8ae882e80b9a4..08a1a893a876862332c7bd35483b93e751ec4f58 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 similarity index 100% rename from src/locationlabs/qmapobjectview.cpp rename to src/location/labs/qmapobjectview.cpp diff --git a/src/locationlabs/qmapobjectview_p.h b/src/location/labs/qmapobjectview_p.h similarity index 96% rename from src/locationlabs/qmapobjectview_p.h rename to src/location/labs/qmapobjectview_p.h index cfdc670233c00720b22b0df55e4b6d538f19aa1d..49b808832db4d63c8108fac9baece28de4b613a4 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 similarity index 91% rename from src/locationlabs/qmapobjectview_p_p.h rename to src/location/labs/qmapobjectview_p_p.h index 5c0cdf827fe9ed76a353aec68865b075a3ed232e..7550e209da561278c54467dac5bba2b78242605b 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 similarity index 100% rename from src/locationlabs/qmappolygonobject.cpp rename to src/location/labs/qmappolygonobject.cpp diff --git a/src/locationlabs/qmappolygonobject_p.h b/src/location/labs/qmappolygonobject_p.h similarity index 95% rename from src/locationlabs/qmappolygonobject_p.h rename to src/location/labs/qmappolygonobject_p.h index f9fcaad7407cc94c70678b872ed27284340b30d8..03eef587a5d03d7941ef355fd49f88d324dac989 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 similarity index 93% rename from src/locationlabs/qmappolygonobject_p_p.h rename to src/location/labs/qmappolygonobject_p_p.h index c2e1eb9c6ad571b01af35258d3166586830895ec..d7e95d49126badeb270ed6cd848289b265afd7ff 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 similarity index 100% rename from src/locationlabs/qmappolylineobject.cpp rename to src/location/labs/qmappolylineobject.cpp diff --git a/src/locationlabs/qmappolylineobject_p.h b/src/location/labs/qmappolylineobject_p.h similarity index 95% rename from src/locationlabs/qmappolylineobject_p.h rename to src/location/labs/qmappolylineobject_p.h index fe844a5cc09f8fa011cb4bf996055fe98b7b7382..68312fb898008fb791d4cd893d1acbf6ff6127a8 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 similarity index 93% rename from src/locationlabs/qmappolylineobject_p_p.h rename to src/location/labs/qmappolylineobject_p_p.h index 80eeb2cdf0d7763cef08dcfaa9170f8ed2bc3d4f..1d5919d2834e06bc46b5a9d9d59e7e66cbc76c1f 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 similarity index 100% rename from src/locationlabs/qmaprouteobject.cpp rename to src/location/labs/qmaprouteobject.cpp diff --git a/src/locationlabs/qmaprouteobject_p.h b/src/location/labs/qmaprouteobject_p.h similarity index 95% rename from src/locationlabs/qmaprouteobject_p.h rename to src/location/labs/qmaprouteobject_p.h index 8fca325c1eea85d3c3b527672181ffa550b14270..dcc3580712ee09f2ca5f6b51857c8651ab96405d 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 similarity index 94% rename from src/locationlabs/qmaprouteobject_p_p.h rename to src/location/labs/qmaprouteobject_p_p.h index 8dbfc6b4ae31afd692850f7adacea07fade210db..e01b1cc69d959597eb2695bb29b38cc396bb326c 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 199c5bd2f904ba523a736de6b5cd171223fea917..89c1fdd5bd7cadbb3a5b95764e5a6138a24a709c 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 add700cac959b50aa18d6d8eb7ffb327a1620f69..0000000000000000000000000000000000000000 --- 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 54fddb62f2cddd47e10a367690cb573995cdc1df..87ea79838d22e87bdabae6f71e729414d0dda765 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 57d89c2bf978d66c07493a2337f7359e5d35e625..dcdc7296286f1450b75f354b057381bca7d4dcf3 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 );