qt/qtdeclarative.git/src/quick/util/qquicksvgparser.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
Fix division by zero in QQuickSvgParser 2025-04-23T07:01:04+00:00 Mitch Curtis mitch.curtis@qt.io 2025-04-01T05:25:37+00:00 98edc631a960bca758dde79ec5e63496eaed1b55 df97b6b2de6282bd6422f1e531a42475dadc980d in Qt Base added an assert which detected this. This patch adds an early return if we're about to divide by zero, similar to 7ca1222296a9650f24979df57cc2c974a7e571ed. It also amends that patch to move the start point == end point check to pathArc(), since it's called from more places. Fixes: QTBUG-135387 Pick-to: 5.15 Change-Id: If9c5655d5e736825e98d3e93201bf889a1785e49 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io> (cherry picked from commit 8d597bea22728268beff583a79e2005b1df423bf) Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io> (cherry picked from commit 503cbb4ad07a06941761607f46964c9540595225) Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io> (cherry picked from commit 5482f67da7705ede34c987c61ee45e3221d7b2b7) 
df97b6b2de6282bd6422f1e531a42475dadc980d in Qt Base added an
assert which detected this.

This patch adds an early return if we're about to divide by zero,
similar to 7ca1222296a9650f24979df57cc2c974a7e571ed. It also
amends that patch to move the start point == end point check
to pathArc(), since it's called from more places.

Fixes: QTBUG-135387
Pick-to: 5.15
Change-Id: If9c5655d5e736825e98d3e93201bf889a1785e49
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
(cherry picked from commit 8d597bea22728268beff583a79e2005b1df423bf)
Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>
(cherry picked from commit 503cbb4ad07a06941761607f46964c9540595225)
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
(cherry picked from commit 5482f67da7705ede34c987c61ee45e3221d7b2b7)
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>
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>
Fix compilation with newer qtbase 2020-08-06T17:42:11+00:00 Fabian Kosmale fabian.kosmale@qt.io 2020-08-03T06:49:37+00:00 84a1cc9fb76269521456d09abab65c402cf481b7 qstrtod is no longer exported, but instead an inline function. This replaces the existing forward declarations with an include of the required private header. Change-Id: I50bd32557c55dddcb197f163609fd7d5a1b2301b Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> 
qstrtod  is no longer exported, but instead an inline function. This
replaces the existing forward declarations with an include of the
required private header.

Change-Id: I50bd32557c55dddcb197f163609fd7d5a1b2301b
Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Fix SVG shape path parsing to not crash when read-only strings 2018-05-15T11:49:08+00:00 Simon Hausmann simon.hausmann@qt.io 2018-05-15T09:00:49+00:00 b159b766eb7974419c2f16a01a8d15221c352dbf The SVG parser code copied from qsvg.cpp used to operate on QStringRef which had no zero termination guarantee. However it did operate on mutable underlying data, so a temporary insertion of a termination during path parsing was "fine". The copied parser here operates on a QString and with upcoming changes in QtQml, those strings may now be located in read-only memory. However QStrings are null terminated (unless carelessly constructed), so we don't need the hack here. Change-Id: If26b4a5168e4abc2e14bb37dcd631672f2a65e4b Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io> 
The SVG parser code copied from qsvg.cpp used to operate on QStringRef
which had no zero termination guarantee. However it did operate on
mutable underlying data, so a temporary insertion of a termination
during path parsing was "fine".

The copied parser here operates on a QString and with upcoming changes
in QtQml, those strings may now be located in read-only memory. However
QStrings are null terminated (unless carelessly constructed), so we
don't need the hack here.

Change-Id: If26b4a5168e4abc2e14bb37dcd631672f2a65e4b
Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
use nullptr consistently (clang-tidy) 2018-02-26T07:13:18+00:00 Shawn Rutledge shawn.rutledge@qt.io 2018-02-21T09:41:54+00:00 499ec43937e926e4f2fa57a9baa455fcb3862262 From now on we prefer nullptr instead of 0 to clarify cases where we are assigning or testing a pointer rather than a numeric zero. Also, replaced cases where 0 was passed as Qt::KeyboardModifiers with Qt::NoModifier (clang-tidy replaced them with nullptr, which waas wrong, so it was just as well to make the tests more readable rather than to revert those lines). Change-Id: I4735d35e4d9f42db5216862ce091429eadc6e65d Reviewed-by: Simon Hausmann <simon.hausmann@qt.io> 
From now on we prefer nullptr instead of 0 to clarify cases where
we are assigning or testing a pointer rather than a numeric zero.

Also, replaced cases where 0 was passed as Qt::KeyboardModifiers
with Qt::NoModifier (clang-tidy replaced them with nullptr, which
waas wrong, so it was just as well to make the tests more readable
rather than to revert those lines).

Change-Id: I4735d35e4d9f42db5216862ce091429eadc6e65d
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Be (somewhat more) consistent about the value of pi 2017-06-14T08:19:47+00:00 Edward Welbourne edward.welbourne@qt.io 2017-01-12T17:02:45+00:00 a021bd87755ccfbe49e132f942ded935c9719b00 Use M_PI in C++ and Math.PI in JavaScript (including QML). Use qmath.h's value for M_PI where we can't avoid an explicit value. Task-number: QTBUG-58083 Change-Id: Iabe938aff62ceac27b939ec33c6ee5e854aac15e Reviewed-by: Simon Hausmann <simon.hausmann@qt.io> 
Use M_PI in C++ and Math.PI in JavaScript (including QML).
Use qmath.h's value for M_PI where we can't avoid an explicit value.

Task-number: QTBUG-58083
Change-Id: Iabe938aff62ceac27b939ec33c6ee5e854aac15e
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>