diff options
| author | Tarja Sundqvist <tarja.sundqvist@qt.io> | 2025-10-11 00:01:05 +0300 |
|---|---|---|
| committer | Tarja Sundqvist <tarja.sundqvist@qt.io> | 2025-10-11 00:01:05 +0300 |
| commit | 47f8a91ed6fb1bd811ee145512dc00d6a9b3fc7f (patch) | |
| tree | a41fbefa7b18bb723ac2753653dfc02f5a9cffb1 | |
| parent | 8a999501e1ac45242d01430846f68a86e3bd63bb (diff) | |
| parent | 0e4a1d326361fc1b26455b078b0d82ff13f670a8 (diff) | |
Merge tag 'v6.5.7-lts' into tqtc/lts-6.5-opensourcev6.5.7-lts-lgpl6.5
Qt 6.5.7-lts release
Conflicts solved:
dependencies.yaml
Change-Id: I190df2c83d0d15e213d248ef70eeb041432e60f6
| -rw-r--r-- | .cmake.conf | 2 | ||||
| -rw-r--r-- | dependencies.yaml | 6 | ||||
| -rw-r--r-- | src/location/doc/src/plugins/osm.qdoc | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/.cmake.conf b/.cmake.conf index a4cba572..8ece7bb2 100644 --- a/.cmake.conf +++ b/.cmake.conf @@ -1,4 +1,4 @@ -set(QT_REPO_MODULE_VERSION "6.5.6") +set(QT_REPO_MODULE_VERSION "6.5.7") set(QT_REPO_MODULE_PRERELEASE_VERSION_SEGMENT "alpha1") list(APPEND QT_EXTRA_INTERNAL_TARGET_DEFINES "QT_NO_AS_CONST=1") diff --git a/dependencies.yaml b/dependencies.yaml index e639af02..9c8e5f74 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -1,10 +1,10 @@ dependencies: ../tqtc-qtbase: - ref: 5d8e9a8415562ba004b38508d91e1fa0254c17d3 + ref: fc0e66eefe3a08428ca4a6e92c66f37ac126d3c4 required: true ../tqtc-qtdeclarative: - ref: ff0a47c8f267e905113b82c53af2742027f0eca6 + ref: 844f9b9b376838bcb44324984876f8bf99d85d38 required: true ../tqtc-qtpositioning: - ref: 07efb0eca9ade2fe7dca843161b177b41387d209 + ref: 45164a9c4fd74fe4fb85bbda61c82caa46f31492 required: true diff --git a/src/location/doc/src/plugins/osm.qdoc b/src/location/doc/src/plugins/osm.qdoc index d00d5fde..e5c52cd3 100644 --- a/src/location/doc/src/plugins/osm.qdoc +++ b/src/location/doc/src/plugins/osm.qdoc @@ -169,8 +169,8 @@ a prefix. This parameter should be set only if \tt{osm.routing.host} is set, and is an OSRM v4 server. \row \li osm.routing.host - \li Url string set when making network requests to the routing server. This parameter should be set to a - valid server url with the correct osrm API. If not specified the default \l {http://router.project-osrm.org/route/v1/driving/}{url} will be used. + \li Url string set when making network requests to the routing server. This parameter should be set to a + valid server url with the correct OSRM API. If not specified the default \l {https://project-osrm.org/docs/v5.24.0/api/#}{url} will be used. \note The API documentation and sources are available at \l {http://project-osrm.org/}{Project OSRM}. \row |