diff options
author | Thiago Marcos P. Santos <thiago@mapbox.com> | 2017-01-23 19:28:00 +0200 |
---|---|---|
committer | Thiago Marcos P. Santos <tmpsantos@gmail.com> | 2017-01-24 10:26:33 +0100 |
commit | 1f3424fafab32431f02c6348382266437bb08aea (patch) | |
tree | b84824418535a50a16b05da649fbeba73f709c25 /platform | |
parent | b35ca2099aef5f5a49b104ee57aecc566feb99a1 (diff) | |
download | qtlocation-mapboxgl-1f3424fafab32431f02c6348382266437bb08aea.tar.gz |
[Qt] Remove QtQuick dependency from the low-level API
Not really needed.
Diffstat (limited to 'platform')
-rw-r--r-- | platform/qt/include/QQuickMapboxGL | 1 | ||||
-rw-r--r-- | platform/qt/include/QQuickMapboxGLMapParameter | 1 | ||||
-rw-r--r-- | platform/qt/include/qmapbox.hpp | 1 | ||||
-rw-r--r-- | platform/qt/include/qquickmapboxgl.hpp (renamed from platform/qt/src/qquickmapboxgl.hpp) | 0 | ||||
-rw-r--r-- | platform/qt/include/qquickmapboxglmapparameter.hpp (renamed from platform/qt/src/qquickmapboxglmapparameter.hpp) | 0 | ||||
-rw-r--r-- | platform/qt/qmlapp/main.cpp | 8 | ||||
-rw-r--r-- | platform/qt/qt5.cmake | 6 | ||||
-rw-r--r-- | platform/qt/src/qmapbox.cpp | 10 |
8 files changed, 8 insertions, 19 deletions
diff --git a/platform/qt/include/QQuickMapboxGL b/platform/qt/include/QQuickMapboxGL new file mode 100644 index 0000000000..db109a1d3a --- /dev/null +++ b/platform/qt/include/QQuickMapboxGL @@ -0,0 +1 @@ +#include "qquickmapboxgl.hpp" diff --git a/platform/qt/include/QQuickMapboxGLMapParameter b/platform/qt/include/QQuickMapboxGLMapParameter new file mode 100644 index 0000000000..603fb2bd51 --- /dev/null +++ b/platform/qt/include/QQuickMapboxGLMapParameter @@ -0,0 +1 @@ +#include "qquickmapboxglmapparameter.hpp" diff --git a/platform/qt/include/qmapbox.hpp b/platform/qt/include/qmapbox.hpp index b2e3b521d0..3aaacb84ea 100644 --- a/platform/qt/include/qmapbox.hpp +++ b/platform/qt/include/qmapbox.hpp @@ -51,7 +51,6 @@ typedef void (*CustomLayerRenderFunction)(void* context, const CustomLayerRender typedef void (*CustomLayerDeinitializeFunction)(void* context); Q_DECL_EXPORT void initializeGLExtensions(); -Q_DECL_EXPORT void registerTypes(); } // namespace QMapbox diff --git a/platform/qt/src/qquickmapboxgl.hpp b/platform/qt/include/qquickmapboxgl.hpp index 39b4395bd6..39b4395bd6 100644 --- a/platform/qt/src/qquickmapboxgl.hpp +++ b/platform/qt/include/qquickmapboxgl.hpp diff --git a/platform/qt/src/qquickmapboxglmapparameter.hpp b/platform/qt/include/qquickmapboxglmapparameter.hpp index 1dca0cf55d..1dca0cf55d 100644 --- a/platform/qt/src/qquickmapboxglmapparameter.hpp +++ b/platform/qt/include/qquickmapboxglmapparameter.hpp diff --git a/platform/qt/qmlapp/main.cpp b/platform/qt/qmlapp/main.cpp index 0dd8c96b7d..8606704002 100644 --- a/platform/qt/qmlapp/main.cpp +++ b/platform/qt/qmlapp/main.cpp @@ -1,4 +1,5 @@ -#include <QMapbox> +#include <QQuickMapboxGL> +#include <QQuickMapboxGLMapParameter> #include <QGuiApplication> #include <QIcon> @@ -13,9 +14,8 @@ int main(int argc, char *argv[]) app.setWindowIcon(QIcon(":icon.png")); #endif - // Exposes the QQuickMapboxGL module so we - // can do `import QQuickMapboxGL 1.0`. - QMapbox::registerTypes(); + qmlRegisterType<QQuickMapboxGL>("QQuickMapboxGL", 1, 0, "MapboxMap"); + qmlRegisterType<QQuickMapboxGLMapParameter>("QQuickMapboxGL", 1, 0, "MapParameter"); QQmlApplicationEngine engine; engine.load(QUrl(QStringLiteral("qrc:/main.qml"))); diff --git a/platform/qt/qt5.cmake b/platform/qt/qt5.cmake index 9c3dde60cd..7210a3d5f5 100644 --- a/platform/qt/qt5.cmake +++ b/platform/qt/qt5.cmake @@ -10,18 +10,16 @@ find_package(Qt5Sql REQUIRED) set(MBGL_QT_LIBRARIES PRIVATE Qt5::Core PRIVATE Qt5::Gui - PRIVATE Qt5::Location PRIVATE Qt5::Network PRIVATE Qt5::OpenGL - PRIVATE Qt5::Quick PRIVATE Qt5::Sql ) target_sources(qmapboxgl + PRIVATE platform/qt/include/qquickmapboxgl.hpp + PRIVATE platform/qt/include/qquickmapboxglmapparameter.hpp PRIVATE platform/qt/src/qquickmapboxgl.cpp - PRIVATE platform/qt/src/qquickmapboxgl.hpp PRIVATE platform/qt/src/qquickmapboxglmapparameter.cpp - PRIVATE platform/qt/src/qquickmapboxglmapparameter.hpp PRIVATE platform/qt/src/qquickmapboxglrenderer.cpp PRIVATE platform/qt/src/qquickmapboxglrenderer.hpp ) diff --git a/platform/qt/src/qmapbox.cpp b/platform/qt/src/qmapbox.cpp index 379b0cdd57..b2f9569356 100644 --- a/platform/qt/src/qmapbox.cpp +++ b/platform/qt/src/qmapbox.cpp @@ -7,8 +7,6 @@ #include <mbgl/util/traits.hpp> #if QT_VERSION >= 0x050000 -#include "qquickmapboxgl.hpp" -#include "qquickmapboxglmapparameter.hpp" #include <QOpenGLContext> #else #include <QGLContext> @@ -57,12 +55,4 @@ Q_DECL_EXPORT void initializeGLExtensions() }); } -Q_DECL_EXPORT void registerTypes() -{ -#if QT_VERSION >= 0x050000 - qmlRegisterType<QQuickMapboxGL>("QQuickMapboxGL", 1, 0, "MapboxMap"); - qmlRegisterType<QQuickMapboxGLMapParameter>("QQuickMapboxGL", 1, 0, "MapParameter"); -#endif -} - } |