diff options
author | Paolo Angelelli <paolo.angelelli@qt.io> | 2018-04-17 15:22:11 +0200 |
---|---|---|
committer | Paolo Angelelli <paolo.angelelli@qt.io> | 2018-04-17 14:45:53 +0000 |
commit | f57956599925dd9eefe70d1b0cc31cb033414a33 (patch) | |
tree | 3abf3e1d66d3c23594f8ba543620a90f96bac5b9 /src | |
parent | 2782765e20ba3bc6af92375574456fd54d4243f7 (diff) | |
download | qtlocation-f57956599925dd9eefe70d1b0cc31cb033414a33.tar.gz |
Add q pointer to QDeclarativeNavigatorPrivatewip/navigation
Since QDeclarativeNavigatorPrivate is what gets passed to the engine,
a QParameterizableObject *q becomes necessary in order to extract
and connect the QGeoMapParameters in the engines.
Change-Id: Id4a8a99f2287faab9c7e67e5355e9c90c33eaa8f
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
Diffstat (limited to 'src')
-rw-r--r-- | src/location/labs/qdeclarativenavigator.cpp | 7 | ||||
-rw-r--r-- | src/location/labs/qdeclarativenavigator_p_p.h | 4 |
2 files changed, 10 insertions, 1 deletions
diff --git a/src/location/labs/qdeclarativenavigator.cpp b/src/location/labs/qdeclarativenavigator.cpp index 69d27a9b..475cb650 100644 --- a/src/location/labs/qdeclarativenavigator.cpp +++ b/src/location/labs/qdeclarativenavigator.cpp @@ -160,9 +160,14 @@ QT_BEGIN_NAMESPACE has been reached. */ +QDeclarativeNavigatorPrivate::QDeclarativeNavigatorPrivate(QParameterizableObject *q_) + : q(q_) +{ +} + QDeclarativeNavigator::QDeclarativeNavigator(QObject *parent) - : QParameterizableObject(parent), d_ptr(new QDeclarativeNavigatorPrivate) + : QParameterizableObject(parent), d_ptr(new QDeclarativeNavigatorPrivate(this)) { } diff --git a/src/location/labs/qdeclarativenavigator_p_p.h b/src/location/labs/qdeclarativenavigator_p_p.h index 291fa3a4..0485ee69 100644 --- a/src/location/labs/qdeclarativenavigator_p_p.h +++ b/src/location/labs/qdeclarativenavigator_p_p.h @@ -60,10 +60,14 @@ class QDeclarativeGeoRoute; class QDeclarativePositionSource; class QGeoMapParameter; class QDeclarativeGeoRouteSegment; +class QParameterizableObject; class Q_LOCATION_PRIVATE_EXPORT QDeclarativeNavigatorPrivate { public: + QDeclarativeNavigatorPrivate(QParameterizableObject *q_); + + QParameterizableObject *q = nullptr; QNavigationManager *m_navigationManager = nullptr; QDeclarativeGeoServiceProvider *m_plugin = nullptr; QDeclarativeGeoMap *m_map = nullptr; |