qt/qtdeclarative.git/src/qmlworkerscript/qquickworkerscript.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
WorkerScript: Properly reset entry in workers map on removal 2025-06-16T18:44:47+00:00 Ulf Hermann ulf.hermann@qt.io 2025-06-12T13:53:51+00:00 a0e71b826abf9d9799198cef67b3cdf80dc62887 If we leave the QQuickWorkerScript pointer around, we can process another message on the worker thread afterwards which would still create the worker script engine for the now-dead QQuickWorkerScript. This crashes. Change-Id: I731ed8f53dffee33dcff73851876944c55a4ce6c Reviewed-by: Sami Shalayel <sami.shalayel@qt.io> (cherry picked from commit 99c7c1f4dadd96ff60ac2a614400def2ee1b78b7) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> (cherry picked from commit 35f1525fe96c9fc2ad3687aafb9e6272fe9830d7) (cherry picked from commit 8aa598404c237502b697b91ac592933cd581b760) (cherry picked from commit 94ab8d2776a9f909bda3cf8ae20142a072db32cd) 
If we leave the QQuickWorkerScript pointer around, we can process
another message on the worker thread afterwards which would still create
the worker script engine for the now-dead QQuickWorkerScript. This
crashes.

Change-Id: I731ed8f53dffee33dcff73851876944c55a4ce6c
Reviewed-by: Sami Shalayel <sami.shalayel@qt.io>
(cherry picked from commit 99c7c1f4dadd96ff60ac2a614400def2ee1b78b7)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
(cherry picked from commit 35f1525fe96c9fc2ad3687aafb9e6272fe9830d7)
(cherry picked from commit 8aa598404c237502b697b91ac592933cd581b760)
(cherry picked from commit 94ab8d2776a9f909bda3cf8ae20142a072db32cd)
QtQml: Fix thread synchronization in QQuickWorkerScript 2025-06-10T09:13:20+00:00 Ulf Hermann ulf.hermann@qt.io 2025-06-03T07:34:42+00:00 5f11aae9dbec3d5ace727a83dfa0d938b9c9eaaf We need to lock whenever we handle the map of workers or their owners. We don't need to lock for merely posting events. Change-Id: Ie4b499a5356665175e548917b6be2ee0bdc03ebe Reviewed-by: Sami Shalayel <sami.shalayel@qt.io> Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> (cherry picked from commit 5ee06587fa9bf8f9eaef402851e34438c64ff94e) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> (cherry picked from commit c5404b55706cca659a71a2dfa1608bfa4582bf69) (cherry picked from commit 81c8126b5b219d32632232f85d21b6772dfa236a) (cherry picked from commit f378aa705de4f0f37637c6bf5f26eeae2d55315d) 
We need to lock whenever we handle the map of workers or their owners.
We don't need to lock for merely posting events.

Change-Id: Ie4b499a5356665175e548917b6be2ee0bdc03ebe
Reviewed-by: Sami Shalayel <sami.shalayel@qt.io>
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
(cherry picked from commit 5ee06587fa9bf8f9eaef402851e34438c64ff94e)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
(cherry picked from commit c5404b55706cca659a71a2dfa1608bfa4582bf69)
(cherry picked from commit 81c8126b5b219d32632232f85d21b6772dfa236a)
(cherry picked from commit f378aa705de4f0f37637c6bf5f26eeae2d55315d)
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>
WorkerScript: Create ExecutionEngines on demand when needed 2022-11-30T08:33:52+00:00 Ulf Hermann ulf.hermann@qt.io 2022-11-29T10:21:00+00:00 7035d1bcf8cb3a7f96d2970cd37132b7bc43719f Creating an engine is rather expensive and as long as your script doesn't run, we don't need one. Furthermore, this allows us to create the engine in the same thread it will run in. Not only is this stylistically better, but it will also let the engine check its stack limits correctly on creation (once we do check stack limits). Task-number: QTBUG-108182 Task-number: QTBUG-106875 Change-Id: Id0003b333c576b3bb603d8b71a5070211c7475bf Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> 
Creating an engine is rather expensive and as long as your script
doesn't run, we don't need one. Furthermore, this allows us to create
the engine in the same thread it will run in. Not only is this
stylistically better, but it will also let the engine check its stack
limits correctly on creation (once we do check stack limits).

Task-number: QTBUG-108182
Task-number: QTBUG-106875
Change-Id: Id0003b333c576b3bb603d8b71a5070211c7475bf
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
QML: Make modules imported with registerModule() available in QML 2022-09-02T13:33:31+00:00 Ulf Hermann ulf.hermann@qt.io 2022-08-25T09:42:23+00:00 b297e8fccf262bb0d870b39a960f0b80193dcaf5 So far, you could only use them from pure JavaScript programs. Also, fix re-exporting parts of native modules. Fixes: QTBUG-105901 Change-Id: I170017083284e6457b1aa0c6e606fd26227edae3 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> 
So far, you could only use them from pure JavaScript programs. Also, fix
re-exporting parts of native modules.

Fixes: QTBUG-105901
Change-Id: I170017083284e6457b1aa0c6e606fd26227edae3
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>
Clean up JSCallData setup 2021-03-17T12:10:22+00:00 Ulf Hermann ulf.hermann@qt.io 2021-03-12T14:46:29+00:00 9caea013ceb221b5617c4940e7bb9ee9fecdd631 We either have pre-populated arguments and thisObject, then we can just use them and keep them const. Or, we want to allocate and populate the arguments and the thisObject. Then, do allocate them in a separate object, and transform that into JSCallData afterwards if necessary. Furthermore, avoid alloc(0) as that just returns the current stack top. Writing to it will clobber other data. Rather, just use nullptr and crash if it's written to. Also, remove the useless operator-> from JSCallData. That one just confuses the reader. Change-Id: I8310911fcfe005b05a07b78fcb3791d991a0c2ce Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> 
We either have pre-populated arguments and thisObject, then we can just
use them and keep them const. Or, we want to allocate and populate the
arguments and the thisObject. Then, do allocate them in a separate
object, and transform that into JSCallData afterwards if necessary.

Furthermore, avoid alloc(0) as that just returns the current stack top.
Writing to it will clobber other data. Rather, just use nullptr and
crash if it's written to.

Also, remove the useless operator-> from JSCallData. That one just
confuses the reader.

Change-Id: I8310911fcfe005b05a07b78fcb3791d991a0c2ce
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Do not resolve URLs when assigning them to a property 2020-06-22T16:37:52+00:00 Ulf Hermann ulf.hermann@qt.io 2020-06-15T15:53:16+00:00 0a1e4cc7ec7548f6273befff9cdddb0bc7a58961 We don't know in advance if a URL is part of the source code and should be relative to the current element, or if it is part of the application data and should not be touched. [ChangeLog][QtQml][Important Behavior Changes] URLs are not resolved or intercepted anymore when assigning them to a "url" property. Instead they are resolved and possibly intercepted when used to access an actual resource. Fixes: QTBUG-76879 Change-Id: Iaa2385aff2c13aa71a12e57385d9afb5dc60a073 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> 
We don't know in advance if a URL is part of the source code and should
be relative to the current element, or if it is part of the application
data and should not be touched.

[ChangeLog][QtQml][Important Behavior Changes] URLs are not resolved or
intercepted anymore when assigning them to a "url" property. Instead
they are resolved and possibly intercepted when used to access an actual
resource.

Fixes: QTBUG-76879
Change-Id: Iaa2385aff2c13aa71a12e57385d9afb5dc60a073
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>