diff options
| author | Alex Blasche <alexander.blasche@qt.io> | 2016-12-05 12:43:52 +0100 |
|---|---|---|
| committer | Alex Blasche <alexander.blasche@qt.io> | 2016-12-05 12:43:52 +0100 |
| commit | 335116ea024f51e1693bba39f78e15131870f1b0 (patch) | |
| tree | 148ccdb4703b4a35afb1b0e3875573b1eb90d0ce /src/plugins/geoservices/nokia/qgeocodereply_nokia.h | |
| parent | 5e4bc1fe908896e9b90e8ad9c3896f35b5ec37be (diff) | |
| parent | ba9b7b9ef674d93680070f6c4bb1053d0d2325dd (diff) | |
| download | qtlocation-335116ea024f51e1693bba39f78e15131870f1b0.tar.gz | |
Merge remote-tracking branch 'gerrit/5.8' into dev
Conflicts:
src/imports/location/qdeclarativegeomap.cpp
src/location/maps/maps.pri
src/location/maps/qgeomap_p_p.h
src/plugins/geoservices/nokia/qgeocodereply_nokia.cpp
src/plugins/geoservices/osm/qgeoroutereplyosm.cpp
Change-Id: I18d31cff9233648178fe3e2636ce294026dfaeb7
Diffstat (limited to 'src/plugins/geoservices/nokia/qgeocodereply_nokia.h')
| -rw-r--r-- | src/plugins/geoservices/nokia/qgeocodereply_nokia.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/plugins/geoservices/nokia/qgeocodereply_nokia.h b/src/plugins/geoservices/nokia/qgeocodereply_nokia.h index 43730403..90443ebc 100644 --- a/src/plugins/geoservices/nokia/qgeocodereply_nokia.h +++ b/src/plugins/geoservices/nokia/qgeocodereply_nokia.h @@ -46,7 +46,7 @@ class QGeoCodeReplyNokia : public QGeoCodeReply { Q_OBJECT public: - QGeoCodeReplyNokia(QNetworkReply *reply, int limit, int offset, const QGeoShape &viewport, QObject *parent = 0); + QGeoCodeReplyNokia(QNetworkReply *reply, int limit, int offset, const QGeoShape &viewport, bool manualBoundsRequired, QObject *parent = 0); ~QGeoCodeReplyNokia(); private Q_SLOTS: @@ -57,6 +57,7 @@ private Q_SLOTS: private: bool m_parsing; + bool m_manualBoundsRequired; }; QT_END_NAMESPACE |