summaryrefslogtreecommitdiff
path: root/src/imports
diff options
context:
space:
mode:
authorPaolo Angelelli <paolo.angelelli@qt.io>2018-01-19 18:53:24 +0100
committerBogDan Vatra <bogdan@kdab.com>2018-02-08 13:45:21 +0000
commit912e7eaf9a044941f7f351d8fe2dfdec71760f73 (patch)
treeeee52f5f70379a72eaf62d9e2b012208ee6c1b4e /src/imports
parent538640b70f2062285415c3c324926bc06e814e9d (diff)
downloadqtlocation-912e7eaf9a044941f7f351d8fe2dfdec71760f73.tar.gz
Introduce MapObjectView
This also adds addMapObject/removeMapObject to MapObjectView With this patch, MapObjectView becomes the intended way to programmatically populate a map with map objects. Objects can still be declared inside a Map{} element, but to programmatically add them it is necessary to add them to a MapObjectView that is added to the map. MapObjectView has then 3 ways to populate the map: via nested map objects, via a model, and via programmatically added map objects. All these 3 ways can be used simultaneously. Change-Id: Ic7712355fa5e5787a0b83d9547693e288cba1960 Reviewed-by: BogDan Vatra <bogdan@kdab.com>
Diffstat (limited to 'src/imports')
-rw-r--r--src/imports/locationlabs/locationlabs.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/imports/locationlabs/locationlabs.cpp b/src/imports/locationlabs/locationlabs.cpp
index 0cdd7f84..4b77a2ae 100644
--- a/src/imports/locationlabs/locationlabs.cpp
+++ b/src/imports/locationlabs/locationlabs.cpp
@@ -35,7 +35,7 @@
****************************************************************************/
//#include <QtLocationLabs/private/qmapiconobject_p.h>
-//#include <QtLocationLabs/private/qmapobjectview_p.h>
+#include <QtLocationLabs/private/qmapobjectview_p.h>
#include <QtLocationLabs/private/qmaprouteobject_p.h>
//#include <QtLocationLabs/private/qdeclarativenavigator_p.h>
@@ -73,7 +73,7 @@ public:
// Register the 5.11 types
// qmlRegisterType<QDeclarativeNavigator>(uri, major, minor, "Navigator");
// qmlRegisterType<QMapIconObject>(uri, major, minor, "MapIconObject");
-// qmlRegisterType<QMapObjectView>(uri, major, minor, "MapObjectView");
+ qmlRegisterType<QMapObjectView>(uri, major, minor, "MapObjectView");
qmlRegisterType<QMapRouteObject>(uri, major, minor, "MapRouteObject");
// Register the latest Qt version as QML type version