summaryrefslogtreecommitdiff
path: root/src/location
diff options
context:
space:
mode:
authorPaolo Angelelli <paolo.angelelli@qt.io>2018-10-25 11:49:34 +0200
committerPaolo Angelelli <paolo.angelelli@qt.io>2018-10-29 14:30:50 +0000
commiteb3143f22ca1642056d821b73af493cdab59dd85 (patch)
tree17f1d8cd4608f7298f27f7bf72a0cb15476c7fee /src/location
parent9abf021df39a6b1159a091ea37258830ebdbfeff (diff)
downloadqtlocation-eb3143f22ca1642056d821b73af493cdab59dd85.tar.gz
Move qquickcoordinateanimation to positioningquick
So plugins can use it, also stand alone ones, and no ugly "import ../" anymore. Change-Id: I4e53815e041e13d495026d60a826a31bccaef2b4 Reviewed-by: Alex Blasche <alexander.blasche@qt.io> Reviewed-by: Bramastyo Harimukti Santoso <bramastyo.harimukti.santoso@pelagicore.com>
Diffstat (limited to 'src/location')
-rw-r--r--src/location/declarativemaps/declarativemaps.pri8
-rw-r--r--src/location/declarativemaps/qquickgeomapgesturearea.cpp2
2 files changed, 4 insertions, 6 deletions
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"