diff options
author | Jesse Crocker <jesse@gaiagps.com> | 2017-03-01 11:15:11 -0700 |
---|---|---|
committer | Jesse Crocker <jesse@gaiagps.com> | 2017-03-01 11:15:11 -0700 |
commit | 9e8dc9a9e3e86adb9987ae69766cc42c7d9efece (patch) | |
tree | f5f0abd4d342c89ad0405d01969f9d6caecc1c90 /platform/qt/qmlapp/main.cpp | |
parent | 16fb0672e64a72b7400c321d55858b73cd5d8c3f (diff) | |
parent | f28d75dccd9bf4a7615df87faccc5cf5eff8df89 (diff) | |
download | qtlocation-mapboxgl-9e8dc9a9e3e86adb9987ae69766cc42c7d9efece.tar.gz |
Merge remote-tracking branch 'origin/master' into feature/custom-vector-source
Diffstat (limited to 'platform/qt/qmlapp/main.cpp')
-rw-r--r-- | platform/qt/qmlapp/main.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
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"))); |