diff options
| author | Michal Klocek <michal.klocek@theqtcompany.com> | 2016-07-28 19:21:35 +0200 |
|---|---|---|
| committer | Michal Klocek <michal.klocek@theqtcompany.com> | 2016-07-28 19:21:47 +0200 |
| commit | 1a1d2e3fff5856dc9d1283b510a9f325c6fb8a93 (patch) | |
| tree | 2c16537e3321cde9ca9730f871f47ed32668e120 /src/plugins/geoservices/osm/qgeomapreplyosm.h | |
| parent | 4e1008b4ac1eea776585ca41a6a3db127cf500ff (diff) | |
| parent | 75dd424e11964d8755abdb1b12b27a8479353b37 (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Change-Id: I37542960aa091ab2074914a2cebb8c5114237a26
Diffstat (limited to 'src/plugins/geoservices/osm/qgeomapreplyosm.h')
| -rw-r--r-- | src/plugins/geoservices/osm/qgeomapreplyosm.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/plugins/geoservices/osm/qgeomapreplyosm.h b/src/plugins/geoservices/osm/qgeomapreplyosm.h index 994e568a..804a0a24 100644 --- a/src/plugins/geoservices/osm/qgeomapreplyosm.h +++ b/src/plugins/geoservices/osm/qgeomapreplyosm.h @@ -40,6 +40,9 @@ #ifndef QGEOMAPREPLYOSM_H #define QGEOMAPREPLYOSM_H +#include "qgeotilefetcherosm.h" +#include "qgeotileproviderosm.h" + #include <QtNetwork/QNetworkReply> #include <QtLocation/private/qgeotiledmapreply_p.h> #include <QtCore/qpointer.h> @@ -51,7 +54,7 @@ class QGeoMapReplyOsm : public QGeoTiledMapReply Q_OBJECT public: - explicit QGeoMapReplyOsm(QNetworkReply *reply, const QGeoTileSpec &spec, QObject *parent = 0); + QGeoMapReplyOsm(QNetworkReply *reply, const QGeoTileSpec &spec, const QString &imageFormat, QObject *parent = 0); ~QGeoMapReplyOsm(); void abort(); |