diff options
| author | Thiago Marcos P. Santos <thiago@mapbox.com> | 2017-01-18 17:03:53 +0100 |
|---|---|---|
| committer | Thiago Marcos P. Santos <tmpsantos@gmail.com> | 2017-01-19 16:34:51 +0100 |
| commit | 99942558b24300016bc1b24e9b40420ac26fe5c4 (patch) | |
| tree | d8fc372e508d59ff514f975629801c8b57b975e9 | |
| parent | 7b61324d13fc98e95a4e4aa96267b7eb30870a23 (diff) | |
| download | qtlocation-mapboxgl-99942558b24300016bc1b24e9b40420ac26fe5c4.tar.gz | |
[Qt] Fix build when using Qt namespaces
Fix when building with namespaces enabled.
http://wiki.qt.io/Qt_In_Namespace
| -rw-r--r-- | platform/qt/include/qmapboxgl.hpp | 12 | ||||
| -rw-r--r-- | platform/qt/src/http_request.hpp | 3 | ||||
| -rw-r--r-- | platform/qt/src/qmapboxgl_p.hpp | 2 | ||||
| -rw-r--r-- | platform/qt/src/qquickmapboxgl.hpp | 2 | ||||
| -rw-r--r-- | platform/qt/src/qquickmapboxglrenderer.hpp | 7 |
5 files changed, 13 insertions, 13 deletions
diff --git a/platform/qt/include/qmapboxgl.hpp b/platform/qt/include/qmapboxgl.hpp index 086601af25..be2d60608b 100644 --- a/platform/qt/include/qmapboxgl.hpp +++ b/platform/qt/include/qmapboxgl.hpp @@ -1,18 +1,18 @@ #ifndef QMAPBOXGL_H #define QMAPBOXGL_H +#include <QImage> #include <QMapbox> #include <QMargins> #include <QObject> #include <QPointF> #include <QSize> +#include <QString> +#include <QStringList> -class QImage; -class QMargins; -class QSize; -class QString; -class QStringList; -class QOpenGLFramebufferObject; +#if QT_VERSION >= 0x050000 +#include <QOpenGLFramebufferObject> +#endif class QMapboxGLPrivate; diff --git a/platform/qt/src/http_request.hpp b/platform/qt/src/http_request.hpp index 29a10467b3..959f97759a 100644 --- a/platform/qt/src/http_request.hpp +++ b/platform/qt/src/http_request.hpp @@ -3,11 +3,10 @@ #include <mbgl/storage/http_file_source.hpp> #include <mbgl/util/async_request.hpp> +#include <QNetworkReply> #include <QNetworkRequest> #include <QUrl> -class QNetworkReply; - namespace mbgl { class Response; diff --git a/platform/qt/src/qmapboxgl_p.hpp b/platform/qt/src/qmapboxgl_p.hpp index 3d2be90273..e2edf3f96c 100644 --- a/platform/qt/src/qmapboxgl_p.hpp +++ b/platform/qt/src/qmapboxgl_p.hpp @@ -43,7 +43,9 @@ public: bool dirty { false }; +#if QT_VERSION >= 0x050000 QOpenGLFramebufferObject *fbo { nullptr }; +#endif public slots: void connectionEstablished(); diff --git a/platform/qt/src/qquickmapboxgl.hpp b/platform/qt/src/qquickmapboxgl.hpp index a6561d4bb4..39b4395bd6 100644 --- a/platform/qt/src/qquickmapboxgl.hpp +++ b/platform/qt/src/qquickmapboxgl.hpp @@ -12,9 +12,9 @@ #include <QPointF> #include <QQmlListProperty> #include <QQuickFramebufferObject> +#include <QQuickItem> class QDeclarativeGeoServiceProvider; -class QQuickItem; class QQuickMapboxGLRenderer; class Q_DECL_EXPORT QQuickMapboxGL : public QQuickFramebufferObject diff --git a/platform/qt/src/qquickmapboxglrenderer.hpp b/platform/qt/src/qquickmapboxglrenderer.hpp index 7adeea0421..1fb7a50f4a 100644 --- a/platform/qt/src/qquickmapboxglrenderer.hpp +++ b/platform/qt/src/qquickmapboxglrenderer.hpp @@ -3,13 +3,12 @@ #include "qmapbox.hpp" #include "qmapboxgl.hpp" +#include <QGeoCoordinate> #include <QObject> +#include <QOpenGLFramebufferObject> #include <QQuickFramebufferObject> #include <QScopedPointer> - -class QGeoCoordinate; -class QOpenGLFramebufferObject; -class QSize; +#include <QSize> class QQuickMapboxGLRenderer : public QObject, public QQuickFramebufferObject::Renderer { |