1 files changed, 15 insertions, 3 deletions
diff --git a/src/imports/locationlabs/locationlabs.cpp b/src/imports/locationlabs/locationlabs.cpp
index cebdf0e4..09fba284 100644
--- a/src/imports/locationlabs/locationlabs.cpp
+++ b/src/imports/locationlabs/locationlabs.cpp
@@ -41,13 +41,22 @@
 #include <QtLocation/private/qmappolygonobject_p.h>
 #include <QtLocation/private/qmappolylineobject_p.h>
 #include <QtLocation/private/qdeclarativenavigator_p.h>
-
+#include <QtLocation/private/qdeclarativenavigator_p_p.h>
+#include <QtLocation/private/qnavigationmanagerengine_p.h>
 #include <QtQml/qqmlextensionplugin.h>
 #include <QtQml/qqml.h>
 #include <QtCore/QDebug>
+#include "locationlabssingleton_p.h"
 
 QT_BEGIN_NAMESPACE
 
+static QObject *singleton_type_factory(QQmlEngine *engine, QJSEngine *jsEngine)
+{
+    Q_UNUSED(engine);
+    Q_UNUSED(jsEngine);
+
+    return new LocationLabsSingleton;
+}
 
 class QtLocationLabsDeclarativeModule: public QQmlExtensionPlugin
 {
@@ -73,13 +82,16 @@ public:
             qmlRegisterType<QMapCircleObject>(uri, major, minor, "MapCircleObject");
             qmlRegisterType<QMapPolygonObject>(uri, major, minor, "MapPolygonObject");
             qmlRegisterType<QMapPolylineObject>(uri, major, minor, "MapPolylineObject");
+            qmlRegisterType<QDeclarativeNavigationBasicDirections>();
             qmlRegisterType<QDeclarativeNavigator>(uri, major, minor, "Navigator");
+            qmlRegisterType<QAbstractNavigator>();
+            qmlRegisterSingletonType<LocationLabsSingleton>(uri, major, minor, "QtLocationLabs", singleton_type_factory);
         } else {
             qDebug() << "Unsupported URI given to load location QML plugin: " << QLatin1String(uri);
         }
     }
 };
 
-#include "locationlabs.moc"
-
 QT_END_NAMESPACE
+
+#include "locationlabs.moc"