qt/qtdeclarative.git/src/qmldom/qqmldomcomments.cpp, branch 6.5.5 Qt Declarative (Quick 2) Revert "Update commercial SPDX-License-Identifier" 2025-06-09T09:05:15+00:00 Tarja Sundqvist tarja.sundqvist@qt.io 2025-05-30T09:58:32+00:00 1bdc78e942ff99f8cc8171a6d21237740a2ad9df This reverts commit 6517e8df24d2381e951b9ec3e0cda2ae33edac37. Commercial SPDX license identifiers need to be removed from the opensource release. Change-Id: I60f8c76ace400db6182e012c8aae050d13d262e9 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io> (cherry picked from commit ab97288de27970ba3cb0300158df757c01dabd77) 
This reverts commit 6517e8df24d2381e951b9ec3e0cda2ae33edac37.

Commercial SPDX license identifiers need to be removed from
the opensource release.

Change-Id: I60f8c76ace400db6182e012c8aae050d13d262e9
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
(cherry picked from commit ab97288de27970ba3cb0300158df757c01dabd77)
Update commercial SPDX-License-Identifier 2023-12-13T16:58:36+00:00 Tarja Sundqvist tarja.sundqvist@qt.io 2023-12-08T15:16:30+00:00 6517e8df24d2381e951b9ec3e0cda2ae33edac37 Some files in tqtc-qtdeclarative were missing the commercial SPDX-License-Identifier. Build files, examples, tests, or documentation are not updated. Task-number: QTQAINFRA-5900 Change-Id: I2cad9a7a271b0b3f3af3074259614b890b266a91 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io> (cherry picked from commit 132fe2df41fc5e69fec39440b35137d5f0d63f6e) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> 
Some files in tqtc-qtdeclarative were missing the commercial
SPDX-License-Identifier. Build files, examples, tests, or
documentation are not updated.

Task-number: QTQAINFRA-5900
Change-Id: I2cad9a7a271b0b3f3af3074259614b890b266a91
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
(cherry picked from commit 132fe2df41fc5e69fec39440b35137d5f0d63f6e)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
qmlformat: change comment handling behavior 2023-04-12T16:29:40+00:00 Semih Yavuz semih.yavuz@qt.io 2023-04-02T21:44:50+00:00 0e200eef89909a0c89621839793f816148c54884 Cumulative commit for adding zero-length comments in qmljsengine and also handling of empty lines after comments. qmljsengine only adds comments if the relavant comment length is larger than 0. Allow adding zero length comments since empty comments might be useful and required in some situations. Unlike the other formatting tools (clang-format, rustfmt) qmlformat didnt respect the emptylines after comments and stick the comments to the associated element. Change this behavior such that a newline/ blankline is added(but no more than one). A few tests in qmldom/reformatter needed to be edited due to this new behavior. Fixes: QTBUG-111231 Change-Id: I2fcdda0bfe569b7a1d19c4058e1604cb0d73291d Reviewed-by: Sami Shalayel <sami.shalayel@qt.io> (cherry picked from commit b5274d073bf015b764c12ce4121d3be6d2378cc9) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> 
Cumulative commit for adding zero-length comments in qmljsengine and
also handling of empty lines after comments.

qmljsengine only adds comments if the relavant comment length is larger
than 0. Allow adding zero length comments since empty comments might be
useful and required in some situations.

Unlike the  other formatting tools (clang-format, rustfmt) qmlformat
didnt respect the emptylines after comments and stick the comments to
the associated element. Change this behavior such that a newline/
blankline is added(but no more than one).

A few tests in qmldom/reformatter needed to be edited due to this new
behavior.

Fixes: QTBUG-111231
Change-Id: I2fcdda0bfe569b7a1d19c4058e1604cb0d73291d
Reviewed-by: Sami Shalayel <sami.shalayel@qt.io>
(cherry picked from commit b5274d073bf015b764c12ce4121d3be6d2378cc9)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Parser: Simplify argument "lists" for type annotations 2022-10-19T18:32:01+00:00 Ulf Hermann ulf.hermann@qt.io 2022-10-17T07:18:06+00:00 e89a06753c772bd96b3299e03b2f7ad78ffc9fb9 There can in fact only be one type argument, and we don't need a finish() method. In fact the finish() method didn't return the type argument at all. Task-number: QTBUG-107171 Change-Id: Ifb7d85ca42a38d37da71b6453b458c7ec10cd64d Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> 
There can in fact only be one type argument, and we don't need a
finish() method. In fact the finish() method didn't return the type
argument at all.

Task-number: QTBUG-107171
Change-Id: Ifb7d85ca42a38d37da71b6453b458c7ec10cd64d
Reviewed-by: Fabian Kosmale <fabian.kosmale@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>
qmldom: comment fix 2021-11-05T13:58:51+00:00 Fawzi Mohamed fawzi@gmx.ch 2021-09-03T09:21:11+00:00 bfb07e39bb422ac71dc73945ece4fe2537b71f5a Change-Id: Idfc8c248b3b8c976a3360dfd34301d7843a4e753 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io> 
Change-Id: Idfc8c248b3b8c976a3360dfd34301d7843a4e753
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
Fix warnings when which are treated as errors with -developer-build 2021-10-04T13:53:33+00:00 Assam Boudjelthia assam.boudjelthia@qt.io 2021-10-01T13:57:56+00:00 7185a63b3c0bcc797d683c5070a799b69ade019b Pick-to: 6.2 Task-number: QTBUG-91163 Change-Id: I7fdac1ff11b4e1c5a6b0caa6cbeae67ddc3effc4 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Ulf Hermann <ulf.hermann@qt.io> 
Pick-to: 6.2
Task-number: QTBUG-91163
Change-Id: I7fdac1ff11b4e1c5a6b0caa6cbeae67ddc3effc4
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
qmldom: writeOut, write reformatted Qml 2021-06-04T22:07:48+00:00 Fawzi Mohamed fawzi.mohamed@qt.io 2021-03-23T14:37:32+00:00 de3d65009adf3c7ce0be6da77ee74b0a2610c9c5 Adding writeOut: support for reformatted Qml - linewriter: write line by line with caching, callbacks, SourceLoaction updating - outwriter: write to line writer, and keep track of updated file locations and reformatted ScriptExpressions - reformatter: reformat javascript Change-Id: I4bdc393fb2d9b5a3db944a850719c24ef8726d15 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> 
Adding writeOut: support for reformatted Qml
- linewriter: write line by line with caching, callbacks,
  SourceLoaction updating
- outwriter: write to line writer, and keep track of updated file
  locations and reformatted ScriptExpressions
- reformatter: reformat javascript

Change-Id: I4bdc393fb2d9b5a3db944a850719c24ef8726d15
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
qmldom: representation and load of Qml Files 2021-06-04T22:06:52+00:00 Fawzi Mohamed fawzi.mohamed@qt.io 2021-03-23T10:02:18+00:00 52d61e705ee606f3b673c757bdf253bdf6134a3b - qqmldomitem: main API for generic access to the Dom - qqmldomtop: represent top level elements: DomEnvironment and Universe - qqmldomelements: definition of the classes representing Qml - qqmldomastcreator: instatiate Dom elements from AST - qqmldomcomments: represent comments in Qml - qqmldomexternalitems: represent files - qqmldommoduleindex: represent types in a module - tst_dom_all: combined test running all dom tests Change-Id: If2320722bc3e6eaab9669ecec6962d5473184f29 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> 
 - qqmldomitem: main API for generic access to the Dom
 - qqmldomtop: represent top level elements: DomEnvironment and Universe
 - qqmldomelements: definition of the classes representing Qml
 - qqmldomastcreator: instatiate Dom elements from AST
 - qqmldomcomments: represent comments in Qml
 - qqmldomexternalitems: represent files
 - qqmldommoduleindex: represent types in a module
 - tst_dom_all: combined test running all dom tests

Change-Id: If2320722bc3e6eaab9669ecec6962d5473184f29
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>