diff options
| -rw-r--r-- | src/imports/positioning/positioning.cpp | 2 | ||||
| -rw-r--r-- | src/location/declarativemaps/declarativemaps.pri | 8 | ||||
| -rw-r--r-- | src/location/declarativemaps/qquickgeomapgesturearea.cpp | 2 | ||||
| -rw-r--r-- | src/positioningquick/qquickgeocoordinateanimation.cpp (renamed from src/imports/positioning/qquickgeocoordinateanimation.cpp) | 0 | ||||
| -rw-r--r-- | src/positioningquick/qquickgeocoordinateanimation_p.h (renamed from src/imports/positioning/qquickgeocoordinateanimation_p.h) | 5 | ||||
| -rw-r--r-- | src/positioningquick/qquickgeocoordinateanimation_p_p.h (renamed from src/imports/positioning/qquickgeocoordinateanimation_p_p.h) | 0 |
6 files changed, 8 insertions, 9 deletions
diff --git a/src/imports/positioning/positioning.cpp b/src/imports/positioning/positioning.cpp index 08ce384b..a3cb98fa 100644 --- a/src/imports/positioning/positioning.cpp +++ b/src/imports/positioning/positioning.cpp @@ -45,7 +45,7 @@ #include <QtPositioningQuick/private/qdeclarativepositionsource_p.h> #include <QtPositioningQuick/private/qdeclarativeposition_p.h> -#include "qquickgeocoordinateanimation_p.h" +#include <QtPositioningQuick/private/qquickgeocoordinateanimation_p.h> #include "locationsingleton.h" #include <QtCore/QVariantAnimation> diff --git a/src/location/declarativemaps/declarativemaps.pri b/src/location/declarativemaps/declarativemaps.pri index 99d72a88..54a0824b 100644 --- a/src/location/declarativemaps/declarativemaps.pri +++ b/src/location/declarativemaps/declarativemaps.pri @@ -1,4 +1,4 @@ -QT += quick-private network positioning-private qml-private core-private gui-private +QT += quick-private network positioning-private positioningquick-private qml-private core-private gui-private INCLUDEPATH += declarativemaps @@ -29,8 +29,7 @@ PRIVATE_HEADERS += \ declarativemaps/qgeomapobject_p.h \ declarativemaps/qgeomapobject_p_p.h \ declarativemaps/qparameterizableobject_p.h \ - declarativemaps/qquickgeomapgesturearea_p.h \ - ../imports/positioning/qquickgeocoordinateanimation_p.h + declarativemaps/qquickgeomapgesturearea_p.h SOURCES += \ declarativemaps/error_messages.cpp \ @@ -58,8 +57,7 @@ SOURCES += \ declarativemaps/qgeomapitemgeometry.cpp \ declarativemaps/qgeomapobject.cpp \ declarativemaps/qparameterizableobject.cpp \ - declarativemaps/qquickgeomapgesturearea.cpp \ - ../imports/positioning/qquickgeocoordinateanimation.cpp + declarativemaps/qquickgeomapgesturearea.cpp load(qt_build_paths) LIBS_PRIVATE += -L$$MODULE_BASE_OUTDIR/lib -lpoly2tri$$qtPlatformTargetSuffix() -lclip2tri$$qtPlatformTargetSuffix() diff --git a/src/location/declarativemaps/qquickgeomapgesturearea.cpp b/src/location/declarativemaps/qquickgeomapgesturearea.cpp index c6f4b42f..b15dbc4d 100644 --- a/src/location/declarativemaps/qquickgeomapgesturearea.cpp +++ b/src/location/declarativemaps/qquickgeomapgesturearea.cpp @@ -35,7 +35,7 @@ ****************************************************************************/ #include "qquickgeomapgesturearea_p.h" -#include "qquickgeocoordinateanimation_p.h" +#include <QtPositioningQuick/private/qquickgeocoordinateanimation_p.h> #include "qdeclarativegeomap_p.h" #include "error_messages_p.h" diff --git a/src/imports/positioning/qquickgeocoordinateanimation.cpp b/src/positioningquick/qquickgeocoordinateanimation.cpp index b00f187d..b00f187d 100644 --- a/src/imports/positioning/qquickgeocoordinateanimation.cpp +++ b/src/positioningquick/qquickgeocoordinateanimation.cpp diff --git a/src/imports/positioning/qquickgeocoordinateanimation_p.h b/src/positioningquick/qquickgeocoordinateanimation_p.h index 95f8dc07..c616d780 100644 --- a/src/imports/positioning/qquickgeocoordinateanimation_p.h +++ b/src/positioningquick/qquickgeocoordinateanimation_p.h @@ -51,6 +51,7 @@ // We mean it. // +#include <QtPositioningQuick/private/qpositioningquickglobal_p.h> #include <QtQuick/private/qquickanimation_p.h> #include <QtPositioning/qgeocoordinate.h> @@ -58,7 +59,7 @@ QT_BEGIN_NAMESPACE class QQuickGeoCoordinateAnimationPrivate; -class QQuickGeoCoordinateAnimation : public QQuickPropertyAnimation +class Q_POSITIONINGQUICK_PRIVATE_EXPORT QQuickGeoCoordinateAnimation : public QQuickPropertyAnimation { Q_OBJECT Q_DECLARE_PRIVATE(QQuickGeoCoordinateAnimation) @@ -90,7 +91,7 @@ Q_SIGNALS: void directionChanged(); }; -QVariant q_coordinateInterpolator(const QGeoCoordinate &from, const QGeoCoordinate &to, qreal progress); +QVariant Q_POSITIONINGQUICK_PRIVATE_EXPORT q_coordinateInterpolator(const QGeoCoordinate &from, const QGeoCoordinate &to, qreal progress); QT_END_NAMESPACE diff --git a/src/imports/positioning/qquickgeocoordinateanimation_p_p.h b/src/positioningquick/qquickgeocoordinateanimation_p_p.h index 946a38cb..946a38cb 100644 --- a/src/imports/positioning/qquickgeocoordinateanimation_p_p.h +++ b/src/positioningquick/qquickgeocoordinateanimation_p_p.h |