qt/qtdeclarative.git/tools/qml/main.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
qml-tool: Treat all arguments passed after "--" as positional 2025-04-24T16:11:13+00:00 Olivier De Cannière olivier.decanniere@qt.io 2025-04-23T08:58:49+00:00 bc4bc3ab9975a3b7ad4a188207319d9cf239cd1d The argument "-a" passed after "--" was being interpreted as the -a option of the qml tool itself instead of being passed along to the qml program as a positional argument. Fixes: QTBUG-136120 Change-Id: I602aea84e4766abeb47adce0f739f12315a70b24 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> (cherry picked from commit 6ac4833a5172e60611987b02145de721061a2906) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> (cherry picked from commit 84b4ad481dffaffd83f99595955a3d5901453426) (cherry picked from commit 965b9399c56075fba25837337084893af3703d3e) Reviewed-by: Sami Shalayel <sami.shalayel@qt.io> 
The argument "-a" passed after "--" was being interpreted as the -a
option of the qml tool itself instead of being passed along to the qml
program as a positional argument.

Fixes: QTBUG-136120
Change-Id: I602aea84e4766abeb47adce0f739f12315a70b24
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
(cherry picked from commit 6ac4833a5172e60611987b02145de721061a2906)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
(cherry picked from commit 84b4ad481dffaffd83f99595955a3d5901453426)
(cherry picked from commit 965b9399c56075fba25837337084893af3703d3e)
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>
qml tool: Use QCommandLineParser::process() rather than parse() 2023-05-16T17:04:44+00:00 Shawn Rutledge shawn.rutledge@qt.io 2023-05-16T05:59:46+00:00 e38868ca9415ec1b1c5dcaba385661b0ecf7466e This handles the --version, --help and --help-all options. Apparently there's no other way to handle --help-all, because addHelpOption() adds two options but only returns one of them. Amends bb6602bca2b20d98f24320b10c7a039e605c9a05 Fixes: QTBUG-100678 Change-Id: Iddd1ba2dae975d7256935d8d357e2f3ac6c013d6 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io> (cherry picked from commit e5007fcc43af6751c72ec970eed11df5fdb8638e) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> 
This handles the --version, --help and --help-all options.
Apparently there's no other way to handle --help-all, because
addHelpOption() adds two options but only returns one of them.
Amends bb6602bca2b20d98f24320b10c7a039e605c9a05

Fixes: QTBUG-100678
Change-Id: Iddd1ba2dae975d7256935d8d357e2f3ac6c013d6
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
(cherry picked from commit e5007fcc43af6751c72ec970eed11df5fdb8638e)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
bin/qml: Fix broken handling of --translation commandline argument 2023-02-08T19:02:24+00:00 Jan Arve Sæther jan-arve.saether@qt.io 2023-02-08T12:19:53+00:00 0785fa27275832a1595a65b3c85e6f9dab6794b9 The QTranslator was destructed right after it was loaded because it was inside a scope Change-Id: I8c9d1604652f18f7d15aa7a0045f580cd8a25063 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> (cherry picked from commit 10c33ed110e1ed03a564f7772f52c0d26879151c) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> 
The QTranslator was destructed right after it was loaded because it was
inside a scope

Change-Id: I8c9d1604652f18f7d15aa7a0045f580cd8a25063
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
(cherry picked from commit 10c33ed110e1ed03a564f7772f52c0d26879151c)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
qml: Fix object counting 2023-01-23T18:28:51+00:00 Ulf Hermann ulf.hermann@qt.io 2023-01-17T14:34:36+00:00 86fa3e117a001452d3ab0f6c7d813981300f15f2 We're not actually interested in whether an object is a window, and we don't really care how many objects are created. The only thing we need to know is whether at least one object is alive after all files have been processed. Fixes: QTBUG-110112 Change-Id: I8d79359f3fb7ec5a54545dc5858cf310b0f52935 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> (cherry picked from commit 1e3bf94b251ee8e8fcf156514df0c3a9b385d5d2) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> 
We're not actually interested in whether an object is a window, and we
don't really care how many objects are created. The only thing we need
to know is whether at least one object is alive after all files have
been processed.

Fixes: QTBUG-110112
Change-Id: I8d79359f3fb7ec5a54545dc5858cf310b0f52935
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
(cherry picked from commit 1e3bf94b251ee8e8fcf156514df0c3a9b385d5d2)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Port from qAsConst() to std::as_const() 2022-10-07T21:38:56+00:00 Marc Mutz marc.mutz@qt.io 2022-10-06T09:30:50+00:00 c2d490a2385ea6f389340a296acaac0fa198c8b9 We've been requiring C++17 since Qt 6.0, and our qAsConst use finally starts to bother us (QTBUG-99313), so time to port away from it now. Since qAsConst has exactly the same semantics as std::as_const (down to rvalue treatment, constexpr'ness and noexcept'ness), there's really nothing more to it than a global search-and-replace. Task-number: QTBUG-99313 Change-Id: I601bf70f020f511019ed28731ba53b14b765dbf0 Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io> 
We've been requiring C++17 since Qt 6.0, and our qAsConst use finally
starts to bother us (QTBUG-99313), so time to port away from it
now.

Since qAsConst has exactly the same semantics as std::as_const (down
to rvalue treatment, constexpr'ness and noexcept'ness), there's really
nothing more to it than a global search-and-replace.

Task-number: QTBUG-99313
Change-Id: I601bf70f020f511019ed28731ba53b14b765dbf0
Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
Port from container::count() and length() to size() 2022-10-07T21:38:48+00:00 Marc Mutz marc.mutz@qt.io 2022-10-05T05:29:16+00:00 958cd3ee1094a068b6d0ff27c73a4b3caff088ad This is a semantic patch using ClangTidyTransformator as in qtbase/df9d882d41b741fef7c5beeddb0abe9d904443d8: auto QtContainerClass = anyOf( expr(hasType(cxxRecordDecl(isSameOrDerivedFrom(hasAnyName(classes))))).bind(o), expr(hasType(namedDecl(hasAnyName(<classes>)))).bind(o)); makeRule(cxxMemberCallExpr(on(QtContainerClass), callee(cxxMethodDecl(hasAnyName({"count", "length"), parameterCountIs(0))))), changeTo(cat(access(o, cat("size"), "()"))), cat("use 'size()' instead of 'count()/length()'")) a.k.a qt-port-to-std-compatible-api with config Scope: 'Container', with the extended set of container classes recognized. Change-Id: Idb1f75dfe2323bd1d9e8b4d58d54f1b4b80c7ed7 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> 
This is a semantic patch using ClangTidyTransformator as in
qtbase/df9d882d41b741fef7c5beeddb0abe9d904443d8:

  auto QtContainerClass = anyOf(
      expr(hasType(cxxRecordDecl(isSameOrDerivedFrom(hasAnyName(classes))))).bind(o),
      expr(hasType(namedDecl(hasAnyName(<classes>)))).bind(o));
  makeRule(cxxMemberCallExpr(on(QtContainerClass),
                             callee(cxxMethodDecl(hasAnyName({"count", "length"),
                                                  parameterCountIs(0))))),
           changeTo(cat(access(o, cat("size"), "()"))),
           cat("use 'size()' instead of 'count()/length()'"))

a.k.a qt-port-to-std-compatible-api with config Scope: 'Container',
with the extended set of container classes recognized.

Change-Id: Idb1f75dfe2323bd1d9e8b4d58d54f1b4b80c7ed7
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>