summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaolo Angelelli <paolo.angelelli@qt.io>2019-05-09 14:47:09 +0200
committerpaolo <paolo.angelelli@qt.io>2019-07-09 11:39:55 +0200
commiteefb728271ac436221a7a81aff8d7a29ac6ed936 (patch)
tree1f1190bde09f4e97a3c4a0adf706fa96839a2521
parent82a298e364b950aa28d0a801bcdab276cc49c3f1 (diff)
downloadqtlocation-eefb728271ac436221a7a81aff8d7a29ac6ed936.tar.gz
Expose recalculateRoutes invokable method in Navigator
This to let the user choose when to do it, if automaticRerouting is disabled. Change-Id: I53251dc42fc831da623f135ff3f1c372ee3dac66 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
-rw-r--r--src/location/labs/qdeclarativenavigator.cpp6
-rw-r--r--src/location/labs/qdeclarativenavigator_p.h2
-rw-r--r--src/location/maps/qnavigationmanagerengine_p.h1
3 files changed, 9 insertions, 0 deletions
diff --git a/src/location/labs/qdeclarativenavigator.cpp b/src/location/labs/qdeclarativenavigator.cpp
index 89b5abef..71e01ccb 100644
--- a/src/location/labs/qdeclarativenavigator.cpp
+++ b/src/location/labs/qdeclarativenavigator.cpp
@@ -352,6 +352,12 @@ QString QDeclarativeNavigator::errorString() const
return d_ptr->m_errorString;
}
+void QDeclarativeNavigator::recalculateRoutes()
+{
+ if (d_ptr->m_navigator)
+ d_ptr->m_navigator->recalculateRoutes();
+}
+
/* !NOT DOCUMENTED YET!
\qmlproperty QAbstractNavigator *Qt.labs.location::Navigator::engineHandle
diff --git a/src/location/labs/qdeclarativenavigator_p.h b/src/location/labs/qdeclarativenavigator_p.h
index 3c168c70..24ff798f 100644
--- a/src/location/labs/qdeclarativenavigator_p.h
+++ b/src/location/labs/qdeclarativenavigator_p.h
@@ -149,6 +149,8 @@ public:
NavigationError error() const;
QString errorString() const;
+ Q_INVOKABLE void recalculateRoutes();
+
signals:
void navigatorReadyChanged(bool ready);
void trackPositionSourceChanged(bool trackPositionSource);
diff --git a/src/location/maps/qnavigationmanagerengine_p.h b/src/location/maps/qnavigationmanagerengine_p.h
index 9089316f..658f4a9a 100644
--- a/src/location/maps/qnavigationmanagerengine_p.h
+++ b/src/location/maps/qnavigationmanagerengine_p.h
@@ -102,6 +102,7 @@ public:
virtual void setAutomaticReroutingEnabled(bool autoRerouting) = 0;
virtual bool automaticReroutingEnabled() const = 0; // configured via navigation params at construction time
virtual bool isOnRoute() = 0;
+ virtual void recalculateRoutes() = 0;
public slots:
virtual bool start() = 0;