diff options
| author | Alex Blasche <alexander.blasche@qt.io> | 2019-03-21 10:16:07 +0100 |
|---|---|---|
| committer | Alex Blasche <alexander.blasche@qt.io> | 2019-04-02 08:06:49 +0000 |
| commit | 01dca9ef9887109be8dfc550f8fa881e208535bf (patch) | |
| tree | d151b04146081fe42e707d6107139d871bf011d6 | |
| parent | 5ea190ac941ed9889de049df221b56db065529d0 (diff) | |
| download | qtlocation-01dca9ef9887109be8dfc550f8fa881e208535bf.tar.gz | |
Reduce QtXmlPattern dependencyv5.13.0-beta2
QtLocation and QtPositioning don't depend on it and QtXmlPatterns
is about to be deprecated in Qt 5.13. The only existing dependency
is the geoflickr example. The most likely resolution is to remove
the example once QtXmlPatterns is removed for good.
This change makes QtXmlPatterns an optional build dependency.
Change-Id: Ibcd9e48604cff4d5e52a63164b30616b0eb100f2
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
| -rw-r--r-- | examples/positioning/positioning.pro | 4 | ||||
| -rw-r--r-- | src/location/declarativemaps/qdeclarativegeoroutemodel.cpp | 4 |
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 |