diff options
author | Paolo Angelelli <paolo.angelelli@qt.io> | 2018-05-07 16:46:12 +0200 |
---|---|---|
committer | Paolo Angelelli <paolo.angelelli@qt.io> | 2018-07-27 08:18:38 +0000 |
commit | fd6c6e9654a14788fc4eb7384c9dfa5de1f5ffde (patch) | |
tree | d15088fbdac71e31fc5ef8aa445df39b6fb4070d /src/location/declarativemaps/declarativemaps.pri | |
parent | 6815fd10c51c72ea91bdbc18acddaee2302871f8 (diff) | |
download | qtlocation-fd6c6e9654a14788fc4eb7384c9dfa5de1f5ffde.tar.gz |
Enable nested MapItemViews
This change allows MapItemView to use a MapItem, MapItemGroup or
MapItemView as delegate.
To achieve this, MapItemView base class also changes from QObject to
MapItemGroup, effectively making MapItemView a MapItemGroup.
Note, though, that MapItemGroup API in Map should be avoided, when
dealing with a MapItemView, and only MapItemView-specific API should be
used.
Tests and example coming after
[ChangeLog][QtLocation] Enabled nesting of MapItemView. This
required a behavioral change, as MapItemView is now a MapItemGroup,
not anymore a plain QObject.
Due to a bug, MapItemView was previously not a Qt Quick Item, making
it possible to create it as a child of any QObject. This has now been
fixed, so if you happen to have a MapItemView in your scene which is
not a child of a Qt Quick Item, you will get an error message.
Task-number: QTBUG-62683
Task-number: QTBUG-62397
Change-Id: Id97e480429e7f952a541fe88df5c01317afeac18
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
Diffstat (limited to 'src/location/declarativemaps/declarativemaps.pri')
-rw-r--r-- | src/location/declarativemaps/declarativemaps.pri | 109 |
1 files changed, 56 insertions, 53 deletions
diff --git a/src/location/declarativemaps/declarativemaps.pri b/src/location/declarativemaps/declarativemaps.pri index 3cd7a529..28001f99 100644 --- a/src/location/declarativemaps/declarativemaps.pri +++ b/src/location/declarativemaps/declarativemaps.pri @@ -3,61 +3,64 @@ QT += quick-private network positioning-private qml-private core-private gui-pri INCLUDEPATH += declarativemaps PRIVATE_HEADERS += \ - declarativemaps/error_messages_p.h \ - declarativemaps/qdeclarativegeomapitemview_p.h \ - declarativemaps/qdeclarativegeoserviceprovider_p.h \ - declarativemaps/qdeclarativegeocodemodel_p.h \ - declarativemaps/qdeclarativegeoroutemodel_p.h \ - declarativemaps/qdeclarativegeoroute_p.h \ - declarativemaps/qdeclarativegeoroutesegment_p.h \ - declarativemaps/qdeclarativegeomaneuver_p.h \ - declarativemaps/qdeclarativegeomap_p.h \ - declarativemaps/qdeclarativegeomaptype_p.h \ - declarativemaps/qdeclarativegeomapitembase_p.h \ - declarativemaps/qdeclarativegeomapquickitem_p.h \ - declarativemaps/qdeclarativecirclemapitem_p.h \ - declarativemaps/qdeclarativerectanglemapitem_p.h \ - declarativemaps/qdeclarativepolygonmapitem_p.h \ - declarativemaps/qdeclarativepolylinemapitem_p.h \ - declarativemaps/qdeclarativeroutemapitem_p.h \ - declarativemaps/qdeclarativegeomapparameter_p.h \ - declarativemaps/qgeomapitemgeometry_p.h \ - declarativemaps/qdeclarativegeomapcopyrightsnotice_p.h \ - declarativemaps/locationvaluetypehelper_p.h \ - declarativemaps/qquickgeomapgesturearea_p.h \ - declarativemaps/qdeclarativegeomapitemgroup_p.h \ - declarativemaps/qparameterizableobject_p.h \ - declarativemaps/qgeomapobject_p.h \ - declarativemaps/qgeomapobject_p_p.h \ - ../imports/positioning/qquickgeocoordinateanimation_p.h + declarativemaps/error_messages_p.h \ + declarativemaps/locationvaluetypehelper_p.h \ + declarativemaps/mapitemviewdelegateincubator_p.h \ + declarativemaps/qdeclarativecirclemapitem_p.h \ + declarativemaps/qdeclarativegeocodemodel_p.h \ + declarativemaps/qdeclarativegeomaneuver_p.h \ + declarativemaps/qdeclarativegeomapcopyrightsnotice_p.h \ + declarativemaps/qdeclarativegeomapitembase_p.h \ + declarativemaps/qdeclarativegeomapitemgroup_p.h \ + declarativemaps/qdeclarativegeomapitemtransitionmanager_p.h \ + declarativemaps/qdeclarativegeomapitemview_p.h \ + declarativemaps/qdeclarativegeomapparameter_p.h \ + declarativemaps/qdeclarativegeomap_p.h \ + declarativemaps/qdeclarativegeomapquickitem_p.h \ + declarativemaps/qdeclarativegeomaptype_p.h \ + declarativemaps/qdeclarativegeoroutemodel_p.h \ + declarativemaps/qdeclarativegeoroute_p.h \ + declarativemaps/qdeclarativegeoroutesegment_p.h \ + declarativemaps/qdeclarativegeoserviceprovider_p.h \ + declarativemaps/qdeclarativepolygonmapitem_p.h \ + declarativemaps/qdeclarativepolylinemapitem_p.h \ + declarativemaps/qdeclarativerectanglemapitem_p.h \ + declarativemaps/qdeclarativeroutemapitem_p.h \ + declarativemaps/qgeomapitemgeometry_p.h \ + declarativemaps/qgeomapobject_p.h \ + declarativemaps/qgeomapobject_p_p.h \ + declarativemaps/qparameterizableobject_p.h \ + declarativemaps/qquickgeomapgesturearea_p.h \ + ../imports/positioning/qquickgeocoordinateanimation_p.h SOURCES += \ - declarativemaps/qdeclarativegeomapitemview.cpp \ - declarativemaps/qdeclarativegeoserviceprovider.cpp \ - declarativemaps/qdeclarativegeocodemodel.cpp \ - declarativemaps/qdeclarativegeoroutemodel.cpp \ - declarativemaps/qdeclarativegeoroute.cpp \ - declarativemaps/qdeclarativegeoroutesegment.cpp \ - declarativemaps/qdeclarativegeomaneuver.cpp \ - declarativemaps/qdeclarativegeomap.cpp \ - declarativemaps/qdeclarativegeomaptype.cpp \ - declarativemaps/qdeclarativegeomapitembase.cpp \ - declarativemaps/qdeclarativegeomapquickitem.cpp \ - declarativemaps/qdeclarativecirclemapitem.cpp \ - declarativemaps/qdeclarativerectanglemapitem.cpp \ - declarativemaps/qdeclarativepolygonmapitem.cpp \ - declarativemaps/qdeclarativepolylinemapitem.cpp \ - declarativemaps/qdeclarativeroutemapitem.cpp \ - declarativemaps/qdeclarativegeomapparameter.cpp \ - declarativemaps/qgeomapitemgeometry.cpp \ - declarativemaps/qdeclarativegeomapcopyrightsnotice.cpp \ - declarativemaps/error_messages.cpp \ - declarativemaps/locationvaluetypehelper.cpp \ - declarativemaps/qquickgeomapgesturearea.cpp \ - declarativemaps/qparameterizableobject.cpp \ - declarativemaps/qdeclarativegeomapitemgroup.cpp \ - declarativemaps/qgeomapobject.cpp \ - ../imports/positioning/qquickgeocoordinateanimation.cpp + declarativemaps/error_messages.cpp \ + declarativemaps/locationvaluetypehelper.cpp \ + declarativemaps/qdeclarativecirclemapitem.cpp \ + declarativemaps/qdeclarativegeocodemodel.cpp \ + declarativemaps/qdeclarativegeomaneuver.cpp \ + declarativemaps/qdeclarativegeomapcopyrightsnotice.cpp \ + declarativemaps/qdeclarativegeomap.cpp \ + declarativemaps/qdeclarativegeomapitembase.cpp \ + declarativemaps/qdeclarativegeomapitemgroup.cpp \ + declarativemaps/qdeclarativegeomapitemtransitionmanager.cpp \ + declarativemaps/qdeclarativegeomapitemview.cpp \ + declarativemaps/qdeclarativegeomapparameter.cpp \ + declarativemaps/qdeclarativegeomapquickitem.cpp \ + declarativemaps/qdeclarativegeomaptype.cpp \ + declarativemaps/qdeclarativegeoroute.cpp \ + declarativemaps/qdeclarativegeoroutemodel.cpp \ + declarativemaps/qdeclarativegeoroutesegment.cpp \ + declarativemaps/qdeclarativegeoserviceprovider.cpp \ + declarativemaps/qdeclarativepolygonmapitem.cpp \ + declarativemaps/qdeclarativepolylinemapitem.cpp \ + declarativemaps/qdeclarativerectanglemapitem.cpp \ + declarativemaps/qdeclarativeroutemapitem.cpp \ + declarativemaps/qgeomapitemgeometry.cpp \ + declarativemaps/qgeomapobject.cpp \ + declarativemaps/qparameterizableobject.cpp \ + declarativemaps/qquickgeomapgesturearea.cpp \ + ../imports/positioning/qquickgeocoordinateanimation.cpp load(qt_build_paths) LIBS_PRIVATE += -L$$MODULE_BASE_OUTDIR/lib -lpoly2tri$$qtPlatformTargetSuffix() -lclip2tri$$qtPlatformTargetSuffix() |