qt/qtdeclarative.git/src/qml/jsruntime/qv4urlobject.cpp, branch 6.5 Qt Declarative (Quick 2) Merge tag 'v6.5.10-lts' into tqtc/lts-6.5-opensource 2026-08-20T12:41:16+00:00 Tarja Sundqvist tarja.sundqvist@qt.io 2026-08-20T12:41:16+00:00 ae5bbc665633ea99eb26800eb5a8978d2213a2c2 Qt 6.5.10-lts release Conflicts solved: dependencies.yaml Change-Id: I30aa1cd656455861044ba1c3c8075f52d20dc2e8 
Qt 6.5.10-lts release

Conflicts solved:
	dependencies.yaml

Change-Id: I30aa1cd656455861044ba1c3c8075f52d20dc2e8
QtQml: Avoid potential gc issues 2025-05-28T11:39:08+00:00 Fabian Kosmale fabian.kosmale@qt.io 2024-12-12T13:39:37+00:00 dbb4cf6fe900365ce3db40f76028d1d77ba6e365 Implicitly constructing a value from a ReturnedValue muddies the responsibility for ensuring that the gc can find the object. With this change, we disable the implicit conversion. The expectation for lifetime management is now: - If a ReturnedValue is stored on the C++ stack, it must be put into a QV4::Scoped class (or there should be a comment why not doing so is safe). Passing a ReturnedValue to a function should no longer be possible, unless the function takes a ReturnedValue, in which case the expectation is that it stores the value in a place where it can be seen by the gc, before doing anything that could trigger a gc run. Using Value::fromReturnedValue can still be used to pass a Value on, but in that case, the expectation is that there is a comment which explains why this is safe. - If a QV4::Value is obtained from a function call, it ought to be stored in a ScopedValue, too. We currently can't enforce this easily, so this should be checked during code review. A possible way forward would be to disallow returning Values, but that would be a larger change, and is deferred to the future. - If a functions has a QV4::Value parameter, it's the callers' responsibilty to ensure that the gc can find it. Fixes: QTBUG-131961 Change-Id: Iea055589d35a5f1ac36fe376d4389eb81de87961 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io> (cherry picked from commit a5feec81934ab0b074d6a8c7621b591851f6b544) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> (cherry picked from commit 64526c5e47a5f7217bced8f5affe29b5f1dc0c99) (cherry picked from commit 1f4193570be1cbff72e103ce9d7633ebef87431e) Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> Reviewed-by: Sami Shalayel <sami.shalayel@qt.io> 
Implicitly constructing a value from a ReturnedValue muddies the
responsibility for ensuring that the gc can find the object.

With this change, we disable the implicit conversion. The expectation
for lifetime management is now:
- If a ReturnedValue is stored on the C++ stack, it must be put into a
  QV4::Scoped class (or there should be a comment why not doing so is
  safe). Passing a ReturnedValue to a function should no longer be
  possible, unless the function takes a ReturnedValue, in which case the
  expectation is that it stores the value in a place where it can be
  seen by the gc, before doing anything that could trigger a gc run.
  Using Value::fromReturnedValue can still be used to pass a Value on,
  but in that case, the expectation is that there is a comment which
  explains why this is safe.
- If a QV4::Value is obtained from a function call, it ought to be
  stored in a ScopedValue, too. We currently can't enforce this easily,
  so this should be checked during code review. A possible way forward
  would be to disallow returning Values, but that would be a larger
  change, and is deferred to the future.
- If a functions has a QV4::Value parameter, it's the callers'
  responsibilty to ensure that the gc can find it.

Fixes: QTBUG-131961
Change-Id: Iea055589d35a5f1ac36fe376d4389eb81de87961
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
(cherry picked from commit a5feec81934ab0b074d6a8c7621b591851f6b544)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
(cherry picked from commit 64526c5e47a5f7217bced8f5affe29b5f1dc0c99)
(cherry picked from commit 1f4193570be1cbff72e103ce9d7633ebef87431e)
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Reviewed-by: Sami Shalayel <sami.shalayel@qt.io>
Revert "Update commercial SPDX-License-Identifier" 2025-01-03T17:25:16+00:00 Tarja Sundqvist tarja.sundqvist@qt.io 2025-01-03T05:44:42+00:00 eee1fcc18b8460f5aa581cc4e41db3ed8ec78fbb This reverts commit da5933f22c00270ac9083a089686e5c54e0057da. Revert of commercial SPDX license identifiers is required for the Qt 6.5.x opensource releases, Qt 6.5.4 onwards. Change-Id: Ic056fb761f242af0ec4c883ecb35d50804c1c67c Reviewed-by: Ulf Hermann <ulf.hermann@qt.io> 
This reverts commit da5933f22c00270ac9083a089686e5c54e0057da.

Revert of commercial SPDX license identifiers is required for the
Qt 6.5.x opensource releases, Qt 6.5.4 onwards.

Change-Id: Ic056fb761f242af0ec4c883ecb35d50804c1c67c
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
Update commercial SPDX-License-Identifier 2023-10-23T09:34:14+00:00 Tarja Sundqvist tarja.sundqvist@qt.io 2023-10-19T18:47:43+00:00 da5933f22c00270ac9083a089686e5c54e0057da Updated the commercial SPDX-License-Identifier to the files in tqtc-qtdeclarative. Examples, tests, or documentation files were not updated. Task-number: QTQAINFRA-5900 Change-Id: I74e2ac15b270b503edc80369b126913dd2ec33e1 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io> 
Updated the commercial SPDX-License-Identifier to
the files in tqtc-qtdeclarative. Examples, tests, or
documentation files were not updated.

Task-number: QTQAINFRA-5900
Change-Id: I74e2ac15b270b503edc80369b126913dd2ec33e1
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
QV4: Fix formatting options for the search component of UrlObject 2023-04-28T14:55:44+00:00 Olivier De Cannière olivier.decanniere@qt.io 2023-03-15T12:55:15+00:00 2d26b07ff63cee999f4c561b45e635c4d503d267 This fix changes the way the search component of UrlObjects is formatted by passing the correct options to QUrl::query. Namely, the EncodeDelimiters flag is no longer set. This now allows for correct encoding of backslashes in search strings. Amends 6cca731f3e1304ce98f1ec18af42e3bd06001eea. Task-number: QTBUG-111014 Change-Id: Iee544dfc7ad6ba374601c8ec4690d11bf07c9b6a Reviewed-by: Ulf Hermann <ulf.hermann@qt.io> (cherry picked from commit af4cd4763a7e0a9b2b52de91ea07eff9be3aa9b0) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> 
This fix changes the way the search component of UrlObjects is formatted
by passing the correct options to QUrl::query. Namely, the
EncodeDelimiters flag is no longer set. This now allows for correct
encoding of backslashes in search strings.

Amends 6cca731f3e1304ce98f1ec18af42e3bd06001eea.

Task-number: QTBUG-111014
Change-Id: Iee544dfc7ad6ba374601c8ec4690d11bf07c9b6a
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
(cherry picked from commit af4cd4763a7e0a9b2b52de91ea07eff9be3aa9b0)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
UrlObject: Properly encode the url search components 2023-02-09T15:52:57+00:00 Olivier De Cannière olivier.decanniere@qt.io 2023-02-08T10:17:58+00:00 bd9610ea61417e6766b4703eb1e1c71111c203fd The href() and search() functions now return properly encoded search components. Tests were added to tst_urlobject.cpp to verify this. Fixes: QTBUG-110454 Change-Id: I3d6485eeeedbd5ba5423cdd42d9c17669ca4bd62 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> (cherry picked from commit 6cca731f3e1304ce98f1ec18af42e3bd06001eea) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> 
The href() and search() functions now return properly encoded search
components.

Tests were added to tst_urlobject.cpp to verify this.

Fixes: QTBUG-110454
Change-Id: I3d6485eeeedbd5ba5423cdd42d9c17669ca4bd62
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
(cherry picked from commit 6cca731f3e1304ce98f1ec18af42e3bd06001eea)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
UrlObject: Fix setting searchParams not modifying the url's search field 2023-02-09T15:52:57+00:00 Olivier De Cannière olivier.decanniere@qt.io 2023-02-06T09:12:11+00:00 37b37a399b10dcb422c37b3c370049bf9b2e6380 Previously, setting the search params via the searchParams.set() method did not change the url's search field. The searchParams object now has a back pointer to the urlObject it belongs to. Whenever a search param is set, the url search field is also updated. The tst_qv4urlobject test was also added to check proper behavior. Task-number: QTBUG-110454 Change-Id: I3b0e843395da8a0e5aedcf71895981f68560d9c6 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> (cherry picked from commit d2c8fe712a87a247864decd9d13167f847035aab) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> 
Previously, setting the search params via the searchParams.set() method
did not change the url's search field. The searchParams object now has a
back pointer to the urlObject it belongs to. Whenever a search param is
set, the url search field is also updated.

The tst_qv4urlobject test was also added to check proper behavior.

Task-number: QTBUG-110454
Change-Id: I3b0e843395da8a0e5aedcf71895981f68560d9c6
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
(cherry picked from commit d2c8fe712a87a247864decd9d13167f847035aab)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
QtQml: Remove unused includes in qml, final part 2022-09-14T19:43:52+00:00 Semih Yavuz semih.yavuz@qt.io 2022-09-13T12:24:51+00:00 3071b21bfd196a18031619caffdf9e9ec26bb107 Drop unnecessary includes detected by clangd-iwyu. Add new includes due to the transitive includes. Also, some of the includes were detected as unused even if they were actually in use. In those cases, use angular brackets instead of "" which deceives the tool not to complain. Affected subfolders: JsRuntime, Qml Fixes: QTBUG-106473 Change-Id: I483da15d42a8e3ce6cd3b654909665fff3075d6b Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> 
Drop unnecessary includes detected by clangd-iwyu.
Add new includes due to the transitive includes. Also, some of the
includes were detected as unused even if they were actually in use.
In those cases, use angular brackets instead of "" which deceives
the tool not to complain.

Affected subfolders: JsRuntime, Qml

Fixes: QTBUG-106473
Change-Id: I483da15d42a8e3ce6cd3b654909665fff3075d6b
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
UrlObject: Add colon after scheme 2022-07-14T21:59:21+00:00 Leticia Valladares leticia.valladares.fernandez@qt.io 2022-06-02T09:01:03+00:00 c61075d2e0049b3c92556c7221e38ef1122118b6 This change adds a colon after scheme in methods 'setProtocol' and 'setUrl' on its protocol line. Likewise, this includes a test called 'colonAfterProtocol' to check if colons were correctly added by using different schemes: ftp, http and https, or if colons were removed when setting the scheme (i.e. from protocol 'ftp:', 'ftp:http:' or 'ftp:::' to 'ftp'). Fixes: QTBUG-103746 Change-Id: I8f847bedd23e476e0ae7901a2f3f3963da3ca04d Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> 
This change adds a colon after scheme in methods 'setProtocol' and
'setUrl' on its protocol line. Likewise, this includes a test called
'colonAfterProtocol' to check if colons were correctly added by using
different schemes: ftp, http and https, or if colons were removed when
setting the scheme (i.e. from protocol 'ftp:', 'ftp:http:' or 'ftp:::'
to 'ftp').

Fixes: QTBUG-103746
Change-Id: I8f847bedd23e476e0ae7901a2f3f3963da3ca04d
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Use SPDX license identifiers 2022-06-11T06:05:15+00:00 Lucie Gérard lucie.gerard@qt.io 2022-05-13T13:12:05+00:00 0dc4fd240a2897c5c443a0ef6d84c416843e4938 Replace the current license disclaimer in files by a SPDX-License-Identifier. Files that have to be modified by hand are modified. License files are organized under LICENSES directory. Pick-to: 6.4 Task-number: QTBUG-67283 Change-Id: I63563bbeb6f60f89d2c99660400dca7fab78a294 Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io> 
Replace the current license disclaimer in files by
a SPDX-License-Identifier.
Files that have to be modified by hand are modified.
License files are organized under LICENSES directory.

Pick-to: 6.4
Task-number: QTBUG-67283
Change-Id: I63563bbeb6f60f89d2c99660400dca7fab78a294
Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>