diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-11-26 12:54:29 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-11-28 08:38:23 +0100 |
| commit | ba9b7b9ef674d93680070f6c4bb1053d0d2325dd (patch) | |
| tree | 685b1717d2ff6112149c2797190990dc59053f43 /src/plugins/geoservices/nokia/qgeocodereply_nokia.h | |
| parent | a98315f652518cb6f2d0a2845dc1d1581c3dbbc0 (diff) | |
| parent | e2ece6d1283926c5a91362933719f3d10efa2ed5 (diff) | |
| download | qtlocation-ba9b7b9ef674d93680070f6c4bb1053d0d2325dd.tar.gz | |
Merge remote-tracking branch 'origin/5.7' into 5.8
Conflicts:
src/plugins/position/winrt/qgeopositioninfosource_winrt.cpp
Change-Id: I44fd4bd47f97acd7ca5a0bdb235a701a59497528
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 85726fca..0d0c47d1 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(); void abort(); @@ -60,6 +60,7 @@ private Q_SLOTS: private: QNetworkReply *m_reply; bool m_parsing; + bool m_manualBoundsRequired; }; QT_END_NAMESPACE |