Merge remote-tracking branch 'origin/tqtc/lts-5.15.14' into tqtc/lts-5.15-opensourcev5.15.14-lts-lgpl5.15

Change-Id: I8843848be96b2c2f72dcbee5ab2f505e6afa28d9

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