summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaolo Angelelli <paolo.angelelli@qt.io>2018-05-04 14:16:10 +0200
committerPaolo Angelelli <paolo.angelelli@qt.io>2018-06-25 11:47:07 +0000
commit350708b2027b433b02a6ec608020e33a34630750 (patch)
tree1653f075743770372f7ba0f0cbb0a5becc9071e0
parent05719fedab5b052c433b5137fa63e5a1136a84e6 (diff)
downloadqtlocation-350708b2027b433b02a6ec608020e33a34630750.tar.gz
Document potential ssl dependency in OSM provider
Task-number: QTBUG-68086 Change-Id: Idce724314777f0edc0ffefcea6cc838757800067 Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com> Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
-rw-r--r--src/location/doc/src/plugins/osm.qdoc8
-rw-r--r--src/location/location.pro2
2 files changed, 7 insertions, 3 deletions
diff --git a/src/location/doc/src/plugins/osm.qdoc b/src/location/doc/src/plugins/osm.qdoc
index 9374f207..649d3bed 100644
--- a/src/location/doc/src/plugins/osm.qdoc
+++ b/src/location/doc/src/plugins/osm.qdoc
@@ -43,10 +43,14 @@ available under the \l {http://www.opendatacommons.org/licenses/odbl}{Open Datab
The Open Street Map geo services plugin can be loaded by using the plugin key "osm".
-\note Since Qt 5.6.2, the available map types offered by this plugin may change without notice depending on the
-actual availability of each provider. To prevent these changes, either a different geo service plugin should be used, or the plugin
+\note Since Qt 5.6.2, the available map types offered by this plugin may change (or be removed)
+without notice depending on the actual availability of a viable openly accessible provider for each type.
+This also implies that providers serving tiles over HTTPS may be used.
+This becomes relevant when using the OSM plugin on platforms, such as Android, for which SSL support is not built into Qt by default.
+To prevent these changes, either a different geo service plugin should be used, or the plugin
parameter \e osm.mapping.providersrepository.address should be set to a user-specified repository, in order to take full control over
(and accept \b responsibility for) selecting the provider that is used for each map type.
+Since Qt 5.9.6 the default nominatim endpoint, used for geocoding and places, has also changed to HTTPS-only.
\section1 Parameters
diff --git a/src/location/location.pro b/src/location/location.pro
index 89c1fdd5..1535a85e 100644
--- a/src/location/location.pro
+++ b/src/location/location.pro
@@ -23,7 +23,7 @@ MODULE_PLUGIN_TYPES = \
geoservices
QMAKE_DOCS = $$PWD/doc/qtlocation.qdocconf
-OTHER_FILES += configure.json doc/src/*.qdoc # show .qdoc files in Qt Creator
+OTHER_FILES += configure.json doc/src/*.qdoc doc/src/plugins/*.qdoc # show .qdoc files in Qt Creator
PUBLIC_HEADERS += \
qlocation.h \