summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--examples/positioning/positioning.pro4
-rw-r--r--src/location/declarativemaps/qdeclarativegeoroutemodel.cpp4
2 files changed, 5 insertions, 3 deletions
diff --git a/examples/positioning/positioning.pro b/examples/positioning/positioning.pro
index bbdc1a42..50c328b3 100644
--- a/examples/positioning/positioning.pro
+++ b/examples/positioning/positioning.pro
@@ -2,6 +2,8 @@ TEMPLATE = subdirs
qtHaveModule(widgets): SUBDIRS += logfilepositionsource
qtHaveModule(quick) {
- SUBDIRS += geoflickr satelliteinfo
+ SUBDIRS += satelliteinfo
+
+ qtHaveModule(xmlpatterns): SUBDIRS += geoflickr
qtHaveModule(network): SUBDIRS += weatherinfo
}
diff --git a/src/location/declarativemaps/qdeclarativegeoroutemodel.cpp b/src/location/declarativemaps/qdeclarativegeoroutemodel.cpp
index 06a03791..4be64642 100644
--- a/src/location/declarativemaps/qdeclarativegeoroutemodel.cpp
+++ b/src/location/declarativemaps/qdeclarativegeoroutemodel.cpp
@@ -115,8 +115,8 @@ static QList<QVariantMap> waypointMetadata(const QList<QDeclarativeGeoWaypoint *
geographic routes from a backend provider. Routes include data about driving
directions between two points, walking directions with multiple waypoints,
and various other similar concepts. It functions much like other Model
- types in QML (see for example \l {Models and Views in Qt Quick#Models}{ListModel} and
- \l XmlListModel), and interacts with views such as \l MapItemView, and \l{ListView}.
+ types in QML (see for example \l {Models and Views in Qt Quick#Models}{ListModel}),
+ and interacts with views such as \l MapItemView, and \l{ListView}.
Like \l Map and \l GeocodeModel, all the data for a RouteModel to work comes
from a services plugin. This is contained in the \l{plugin} property, and