diff options
| author | Alex Blasche <alexander.blasche@theqtcompany.com> | 2015-05-29 11:44:10 +0200 |
|---|---|---|
| committer | Alex Blasche <alexander.blasche@theqtcompany.com> | 2015-05-29 12:10:02 +0000 |
| commit | 5447b4b29a0d0e931ca759eab4da333d32e77aff (patch) | |
| tree | 36ee201ed1996a7a6041bb3464c2078b0f1331e6 | |
| parent | 16182b9f12647d1df1a7be6e709e341b93ba79dc (diff) | |
| download | qtlocation-5447b4b29a0d0e931ca759eab4da333d32e77aff.tar.gz | |
Fix doc issues around MapPolyline
MapRoute inherits from MapPolyline but qdoc doesn't recognize QML
inheritance and/or we don't really want to document protected
MapPolyline properties in MapRoute.
Fixes some broken links in the same area while we are at it.
Change-Id: Icd4095d98dbf2555c601c4088c85e9a2a08b3186
Reviewed-by: Michal Klocek <michal.klocek@theqtcompany.com>
Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
| -rw-r--r-- | src/imports/location/qdeclarativepolygonmapitem.cpp | 2 | ||||
| -rw-r--r-- | src/imports/location/qdeclarativepolylinemapitem.cpp | 2 | ||||
| -rw-r--r-- | src/imports/location/qdeclarativeroutemapitem.cpp | 14 |
3 files changed, 16 insertions, 2 deletions
diff --git a/src/imports/location/qdeclarativepolygonmapitem.cpp b/src/imports/location/qdeclarativepolygonmapitem.cpp index 1cde7f93..5b94d009 100644 --- a/src/imports/location/qdeclarativepolygonmapitem.cpp +++ b/src/imports/location/qdeclarativepolygonmapitem.cpp @@ -107,7 +107,7 @@ QT_BEGIN_NAMESPACE or removing points. Like the other map objects, MapPolygon is normally drawn without a smooth - appearance. Setting the \l {QtQuick::Item::opacity}{opacity} property will force the object to + appearance. Setting the \l {Item::opacity}{opacity} property will force the object to be blended, which decreases performance considerably depending on the hardware in use. \section2 Example Usage diff --git a/src/imports/location/qdeclarativepolylinemapitem.cpp b/src/imports/location/qdeclarativepolylinemapitem.cpp index d88b89b8..0a9b161a 100644 --- a/src/imports/location/qdeclarativepolylinemapitem.cpp +++ b/src/imports/location/qdeclarativepolylinemapitem.cpp @@ -88,7 +88,7 @@ QT_BEGIN_NAMESPACE the Map grows in direct proportion to the number of points in the polyline. Like the other map objects, MapPolyline is normally drawn without a smooth - appearance. Setting the \l {QtQuick::Item::opacity}{opacity} property will force the object to + appearance. Setting the \l {Item::opacity}{opacity} property will force the object to be blended, which decreases performance considerably depending on the hardware in use. \note MapPolylines are implemented using the OpenGL GL_LINES diff --git a/src/imports/location/qdeclarativeroutemapitem.cpp b/src/imports/location/qdeclarativeroutemapitem.cpp index 2e780d4f..78485cc0 100644 --- a/src/imports/location/qdeclarativeroutemapitem.cpp +++ b/src/imports/location/qdeclarativeroutemapitem.cpp @@ -76,6 +76,20 @@ \snippet declarative/maps.qml MapRoute */ +/*! + \qmlpropertygroup Location::MapRoute::line + \qmlproperty int MapRoute::line.width + \qmlproperty color MapRoute::line.color + + This property is part of the line property group. The line + property group holds the width and color used to draw the line. + + The width is in pixels and is independent of the zoom level of the map. + The default values correspond to a black border with a width of 1 pixel. + + For no line, use a width of 0 or a transparent color. +*/ + QDeclarativeRouteMapItem::QDeclarativeRouteMapItem(QQuickItem *parent) : QDeclarativePolylineMapItem(parent), route_(0) |