Commit f5795659 authored by Paolo Angelelli's avatar Paolo Angelelli
Browse files

Add q pointer to QDeclarativeNavigatorPrivate


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: default avatarAlex Blasche <alexander.blasche@qt.io>
Showing with 10 additions and 1 deletion
...@@ -160,9 +160,14 @@ QT_BEGIN_NAMESPACE ...@@ -160,9 +160,14 @@ QT_BEGIN_NAMESPACE
has been reached. has been reached.
*/ */
QDeclarativeNavigatorPrivate::QDeclarativeNavigatorPrivate(QParameterizableObject *q_)
: q(q_)
{
}
QDeclarativeNavigator::QDeclarativeNavigator(QObject *parent) QDeclarativeNavigator::QDeclarativeNavigator(QObject *parent)
: QParameterizableObject(parent), d_ptr(new QDeclarativeNavigatorPrivate) : QParameterizableObject(parent), d_ptr(new QDeclarativeNavigatorPrivate(this))
{ {
} }
......
...@@ -60,10 +60,14 @@ class QDeclarativeGeoRoute; ...@@ -60,10 +60,14 @@ class QDeclarativeGeoRoute;
class QDeclarativePositionSource; class QDeclarativePositionSource;
class QGeoMapParameter; class QGeoMapParameter;
class QDeclarativeGeoRouteSegment; class QDeclarativeGeoRouteSegment;
class QParameterizableObject;
class Q_LOCATION_PRIVATE_EXPORT QDeclarativeNavigatorPrivate class Q_LOCATION_PRIVATE_EXPORT QDeclarativeNavigatorPrivate
{ {
public: public:
QDeclarativeNavigatorPrivate(QParameterizableObject *q_);
QParameterizableObject *q = nullptr;
QNavigationManager *m_navigationManager = nullptr; QNavigationManager *m_navigationManager = nullptr;
QDeclarativeGeoServiceProvider *m_plugin = nullptr; QDeclarativeGeoServiceProvider *m_plugin = nullptr;
QDeclarativeGeoMap *m_map = nullptr; QDeclarativeGeoMap *m_map = nullptr;
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment