diff options
| author | Michal Klocek <michal.klocek@theqtcompany.com> | 2015-06-09 14:37:52 +0200 |
|---|---|---|
| committer | Michal Klocek <michal.klocek@theqtcompany.com> | 2015-06-23 12:42:51 +0000 |
| commit | f5c6e2690a749cd1e33b49a1cb57ebfa94996da3 (patch) | |
| tree | baa7e5969a6caf7e7dea77c61144a534cfdae9fb /src/imports/positioning/positioning.cpp | |
| parent | 526fd8bd3d9ef112399d1cae6c0dfa094525d33e (diff) | |
| download | qtlocation-f5c6e2690a749cd1e33b49a1cb57ebfa94996da3.tar.gz | |
Add new types of interpolation to CoordinateAnimation
A longitude animation can go in two directions West and East.
Current implementation is always using the shortest
animation path between two coordinates. Provide
setting to overload this behavior.
Add 'direction' setting to CoordianteAnimation. Implement
two new interpolators and provide new private
implementation derived form qquickpropertyanimation.
Change-Id: Ida70780c8aef60ebea7a8b8d59f115c583430374
Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
Diffstat (limited to 'src/imports/positioning/positioning.cpp')
| -rw-r--r-- | src/imports/positioning/positioning.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/imports/positioning/positioning.cpp b/src/imports/positioning/positioning.cpp index d8380750..ef8eb776 100644 --- a/src/imports/positioning/positioning.cpp +++ b/src/imports/positioning/positioning.cpp @@ -39,7 +39,7 @@ #include "qdeclarativepositionsource_p.h" #include "qdeclarativeposition_p.h" -#include "qdeclarativegeocoordinateanimation_p.h" +#include "qquickgeocoordinateanimation_p.h" #include "locationsingleton.h" #include <QtCore/QVariantAnimation> @@ -531,7 +531,7 @@ public: // Register the 5.3 types // Introduction of 5.3 version; existing 5.0 exports become automatically available under 5.3 minor = 3; - qmlRegisterType<QDeclarativeGeoCoordinateAnimation >(uri, major, minor, "CoordinateAnimation"); + qmlRegisterType<QQuickGeoCoordinateAnimation >(uri, major, minor, "CoordinateAnimation"); qmlRegisterType<QDeclarativePosition, 1 >(uri, major, minor, "Position"); // Register the 5.4 types |