diff options
8 files changed, 4 insertions, 8 deletions
diff --git a/src/location/declarativemaps/qdeclarativegeoserviceprovider.cpp b/src/location/declarativemaps/qdeclarativegeoserviceprovider.cpp index c1e3c81c..a455cc09 100644 --- a/src/location/declarativemaps/qdeclarativegeoserviceprovider.cpp +++ b/src/location/declarativemaps/qdeclarativegeoserviceprovider.cpp @@ -37,6 +37,7 @@ #include "qdeclarativegeoserviceprovider_p.h" #include <QtQml/QQmlInfo> #include <QtQml/QQmlEngine> +#include <QLocale> QT_BEGIN_NAMESPACE diff --git a/src/location/maps/qgeoserviceprovider.h b/src/location/maps/qgeoserviceprovider.h index 58ed2066..69d5efaf 100644 --- a/src/location/maps/qgeoserviceprovider.h +++ b/src/location/maps/qgeoserviceprovider.h @@ -45,7 +45,6 @@ QT_BEGIN_NAMESPACE class QLocale; -class QStringList; class QGeoCodingManager; class QGeoMappingManager; class QGeoRoutingManager; diff --git a/src/plugins/geoservices/mapbox/qgeoroutereplymapbox.h b/src/plugins/geoservices/mapbox/qgeoroutereplymapbox.h index f19faee7..302ed2dc 100644 --- a/src/plugins/geoservices/mapbox/qgeoroutereplymapbox.h +++ b/src/plugins/geoservices/mapbox/qgeoroutereplymapbox.h @@ -51,7 +51,6 @@ class QGeoRouteReplyMapbox : public QGeoRouteReply Q_OBJECT public: - explicit QGeoRouteReplyMapbox(QObject *parent = 0); QGeoRouteReplyMapbox(QNetworkReply *reply, const QGeoRouteRequest &request, QObject *parent = 0); ~QGeoRouteReplyMapbox(); diff --git a/src/plugins/geoservices/mapboxgl/qgeomapmapboxgl.cpp b/src/plugins/geoservices/mapboxgl/qgeomapmapboxgl.cpp index 66763af3..92c50e94 100644 --- a/src/plugins/geoservices/mapboxgl/qgeomapmapboxgl.cpp +++ b/src/plugins/geoservices/mapboxgl/qgeomapmapboxgl.cpp @@ -43,7 +43,7 @@ #include <QtCore/QByteArray> #include <QtCore/QCoreApplication> #include <QtGui/QOpenGLContext> -#include <QtGui/QOpenGLFramebufferObject> +#include <QtOpenGL/QOpenGLFramebufferObject> #include <QtLocation/private/qdeclarativecirclemapitem_p.h> #include <QtLocation/private/qdeclarativegeomapitembase_p.h> #include <QtLocation/private/qdeclarativepolygonmapitem_p.h> diff --git a/src/plugins/geoservices/mapboxgl/qsgmapboxglnode.h b/src/plugins/geoservices/mapboxgl/qsgmapboxglnode.h index f89ee143..b437ed9a 100644 --- a/src/plugins/geoservices/mapboxgl/qsgmapboxglnode.h +++ b/src/plugins/geoservices/mapboxgl/qsgmapboxglnode.h @@ -42,7 +42,7 @@ #include <QtQuick/QSGRenderNode> #include <QtQuick/QSGSimpleTextureNode> #include <QtQuick/private/qsgtexture_p.h> -#include <QtGui/QOpenGLFramebufferObject> +#include <QtOpenGL/QOpenGLFramebufferObject> #include <QMapboxGL> diff --git a/src/plugins/geoservices/osm/qgeofiletilecacheosm.cpp b/src/plugins/geoservices/osm/qgeofiletilecacheosm.cpp index 3ca0255c..c6431aee 100644 --- a/src/plugins/geoservices/osm/qgeofiletilecacheosm.cpp +++ b/src/plugins/geoservices/osm/qgeofiletilecacheosm.cpp @@ -40,8 +40,6 @@ #include <QDirIterator> #include <QPair> #include <QDateTime> -#include <QtConcurrent> -#include <QThread> QT_BEGIN_NAMESPACE diff --git a/src/plugins/geoservices/osm/qgeofiletilecacheosm.h b/src/plugins/geoservices/osm/qgeofiletilecacheosm.h index a7a203c8..b7c33363 100644 --- a/src/plugins/geoservices/osm/qgeofiletilecacheosm.h +++ b/src/plugins/geoservices/osm/qgeofiletilecacheosm.h @@ -40,8 +40,8 @@ #include "qgeotileproviderosm.h" #include <QtLocation/private/qgeofiletilecache_p.h> #include <QHash> -#include <QtConcurrent> #include <qatomic.h> +#include <QDir> QT_BEGIN_NAMESPACE diff --git a/src/plugins/geoservices/osm/qgeoroutereplyosm.h b/src/plugins/geoservices/osm/qgeoroutereplyosm.h index feaae59c..964046c5 100644 --- a/src/plugins/geoservices/osm/qgeoroutereplyosm.h +++ b/src/plugins/geoservices/osm/qgeoroutereplyosm.h @@ -50,7 +50,6 @@ class QGeoRouteReplyOsm : public QGeoRouteReply Q_OBJECT public: - explicit QGeoRouteReplyOsm(QObject *parent = 0); QGeoRouteReplyOsm(QNetworkReply *reply, const QGeoRouteRequest &request, QObject *parent = 0); ~QGeoRouteReplyOsm(); |