qt/qtdeclarative.git, branch dev

qmldom: Visit call optional token instead of its lparen twice

2026-10-02T20:09:25+00:00

Amends ae6dfc63668556e89057edb1b83de28d7554c5ef

Task-number: QTBUG-151040
Pick-to: 6.12
Co-Authored-By: Claude Opus 5 
Change-Id: I438ca1b8e2de4fc05769f2d627c3d7edaefe94a0
Reviewed-by: Sami Shalayel

QQmlJSUtils: Accept a relative path in qmlSourcePathFromBuildPath()

2026-10-02T15:36:15+00:00

qmlSourcePathFromBuildPath() found the module through a clean absolute
form of the path, then cut the module's absolute directory off the path
as passed in. qmllint passes the linted file's path as given on its
command line, so linting a build-folder copy by a relative path with
--resource read past the end of the string and crashed, for example:

    cd build && qmllint --resource .qt/rcc/qmake_Mod.qrc \
        --resource .qt/rcc/Mod_raw_qml_0.qrc Mod/Main.qml

Cut the module directory off the clean absolute path instead.

Pick-to: 6.12
Assisted-by: Claude Code
Change-Id: I92c078e7c45274b1eeb61c648d64514430cee817
Reviewed-by: Sami Shalayel

Tests: Remove unused includes from dom/format tests

2026-10-02T11:22:46+00:00

Task-number: QTBUG-151040
Change-Id: I899b2c662e4de5bfe3f4db5af608dfb4a4ddcc93
Reviewed-by: Semih Yavuz

qmldom: Make --reformat reformat something

2026-10-02T11:22:43+00:00

It turned every file down. Two mistakes, each enough on its own.

What loadFile() hands its callback is the metadata about the file, of
which the file itself is a field, so the check that what was loaded is a
QmlFile was asking the metadata, which is an ExternalItemInfo and never
a QmlFile. Ask the file, the way the option that dumps the syntax tree
already does.

The index the loaded files are put at was never advanced, so every file
after the first was dropped and the slots they should have gone in
stayed empty. An empty slot is not a QmlFile either, which is the other
way the same message came out.

With both fixed it writes what qmlformat writes: --reformat over a file
gives what qmlformat --normalize gives, byte for byte, since the dom
writes the script of a file through the same formatter and the options
it reformats with are the normalising ones.

Amends 4cfb323389363bf12f84044b8c7501ef2f0441b9

Task-number: QTBUG-151040
Pick-to: 6.12 6.8
Co-Authored-By: Claude Opus 5 
Change-Id: Ibb38e0f422ebdf8991dbbc45208acbc1e4abf036
Reviewed-by: Semih Yavuz

Support negative radius for inverted corners on PathRectangle

2026-10-02T07:00:24+00:00

A negative radius (or per-corner radius) now produces a concave,
"inverted" corner instead of the usual convex one, for both the Rounded
and Squircle corner shapes.

Change-Id: I258871293d7c42ea890692ad3c6ce17253312480
Reviewed-by: Eirik Aavitsland

ohos: Avoid mouse move exactly on item edge in tst_cursor

2026-10-01T19:52:54+00:00

controls() and pageIndicator() moved the mouse to the exact (0, 0)
edge of the control under test. QQuickItem::contains() treats bounds
as (x >= 0 && x < width), so a position of QPoint(0, 0) has no margin
for error.

On platforms with a non-integer device pixel ratio (e.g. OHOS, DPR 1.9)
such a position is not delivered exactly. QTest::mouseMove() passes
device-independent coordinates, qt_handleMouseEvent() converts them to
native coordinates, and QWindowSystemInterface::handleMouseEvent()
converts them back by multiplying with scale factor (1/sf). For this
scale factor that round trip is not an exact inverse, so a move
requested at exactly (0, 0) can be delivered a fraction outside the
item.

Move the probe points from (0, 0) to (1, 1), so that the mouse
position lands on the control regardless of the sub-pixel rounding
error.

Fixes: QTBUG-150331
Pick-to: 6.12
Change-Id: I43e15558dc18636f60dd7a70a062c60a3fc17dd4
Reviewed-by: Liang Qi

qmlformat: Don't add extra commas to holed arrays

2026-10-01T16:09:38+00:00

`[1, 2, 3, 4, , ,]` is parsed with the comma that comes before the
trailing holes stored on two different nodes: on the ArrayPattern, and
on the list element that wraps those holes. The formatter wrote both, so
every pass over the file appended another hole to the array. That
changes the semantics of the expression.

Store the comma on the ArrayPattern only if it isn't already part of the
elision.

This also ensures missing spaces between commas in the array.

Amends d41f97e86702d8c5ac81a4246e1aab8dd965cbe4

Task-number: QTBUG-151040
Pick-to: 6.12
Change-Id: Ied05c0100210b0b2d06cf69a4fe55ee565239730
Reviewed-by: Fabian Kosmale

Parser: Cleanup AST token kinds

2026-10-01T10:56:07+00:00

Rename Expression to CommaExpression and Module to ESModule to better
express their purpose.

Remove unused kinds.

Task-number: QTBUG-151040
Co-Authored-By: Claude Opus 5 
Change-Id: Icebd15cc791a4b39ceb3de62d53583a769fda4a7
Reviewed-by: Sami Shalayel

qmlformat: Write the comma of each hole of an array, not the first one's

2026-10-01T10:56:05+00:00

Task-number: QTBUG-151040
Pick-to: 6.12 6.8
Change-Id: I57586956dff6f83dfc947c1bd23eac5391b710d7
Reviewed-by: Sami Shalayel

Doc: Clarify TableView sorting property behavior at run-time

2026-10-01T05:11:37+00:00

Add a note to sortColumn and sortOrder explaining that sortByColumn()
should be preferred when setting both at run-time, to avoid sorting the
model twice. Also link sortColumn/sortOrder from sortByColumn()'s
documentation.

Change-Id: I035fb83d8293932ff596bdd33195d3d48016cfe9
Reviewed-by: Richard Moe Gustavsen 
Reviewed-by: Jerome Pasion