diff options
author | Tarja Sundqvist <tarja.sundqvist@qt.io> | 2024-05-08 08:14:45 +0300 |
---|---|---|
committer | Tarja Sundqvist <tarja.sundqvist@qt.io> | 2024-05-08 08:14:45 +0300 |
commit | 502f887603c42e31555462f695e07bdff66e64e0 (patch) | |
tree | 1c1d2ba104464b2aabeb9740d6f8031b07ff1fa1 | |
parent | f6953a8d604b906b170fb4610e124e7c31260a18 (diff) | |
parent | 6e8a31d7ce212af136a5d6bd7ac6daf9c0bcd564 (diff) |
Merge remote-tracking branch 'origin/tqtc/lts-5.15.14' into tqtc/lts-5.15-opensourcev5.15.14-lts-lgpl5.15
Change-Id: I8843848be96b2c2f72dcbee5ab2f505e6afa28d9
-rw-r--r-- | .qmake.conf | 2 | ||||
-rw-r--r-- | examples/location/location.pro | 3 | ||||
-rw-r--r-- | src/location/doc/src/qtlocation.qdoc | 10 |
3 files changed, 8 insertions, 7 deletions
diff --git a/.qmake.conf b/.qmake.conf index 092e259b..f051b5bd 100644 --- a/.qmake.conf +++ b/.qmake.conf @@ -3,7 +3,7 @@ CONFIG += warning_clean DEFINES += QT_NO_JAVA_STYLE_ITERATORS QT_NO_LINKED_LIST -MODULE_VERSION = 5.15.13 +MODULE_VERSION = 5.15.14 # Adds a way to debug location. The define is needed for multiple subprojects as they # include the essential headers. diff --git a/examples/location/location.pro b/examples/location/location.pro index 69fa6516..8f98816f 100644 --- a/examples/location/location.pro +++ b/examples/location/location.pro @@ -9,5 +9,6 @@ qtHaveModule(quick) { itemview_transitions \ planespotter - qtHaveModule(widgets): SUBDIRS += geojson_viewer + QT_FOR_CONFIG += location-private + qtHaveModule(widgets):qtConfig(location-labs-plugin): SUBDIRS += geojson_viewer } diff --git a/src/location/doc/src/qtlocation.qdoc b/src/location/doc/src/qtlocation.qdoc index 059d03f2..f37cee1f 100644 --- a/src/location/doc/src/qtlocation.qdoc +++ b/src/location/doc/src/qtlocation.qdoc @@ -76,11 +76,11 @@ available from some of the popular location services. The Qt Location API enables you to: \list - \li access and present map data, - \li support touch gesture on a specific area of the map, - \li query for a specific geographical location and route, - \li add additional layers on top, such as polylines and circles, - \li and search for places and related images. + \li Access and present map data. + \li Support touch gesture on a specific area of the map. + \li Query for a specific geographical location and route. + \li Add additional layers on top, such as polylines and circles. + \li Search for places and related images. \endlist \section1 Getting Started |