qt/qtdeclarative.git, branch 6.11

Dialogs: Use generic QtQuick.Controls import in base fallback dialogs

2026-05-07T16:18:05+00:00

Commit f2920663dcd3 ("Dialogs: Only import the QQC2 module used by the
style") changed the base fallback dialog QML files to import
QtQuick.Controls.Basic instead of QtQuick.Controls. This hardcodes the
Basic style for the fallback, preventing the active style from being
picked up at runtime. Only the style-specific files (+Fusion/, +Material/, etc.) should hardcode their style module.

Revert the base fallback imports to use the generic QtQuick.Controls
module so the active style is applied correctly.

Fixes: QTBUG-133655
Pick-to: 6.8
Change-Id: Ia4b98e13858c411d0b78bdc16027093bf685ce2e
Reviewed-by: Oliver Eftevaag 
(cherry picked from commit 9ebd2fbd7ea08333257f8566c3994870451f0888)
Reviewed-by: Qt Cherry-pick Bot

StyleKit: add qtlabsstylekit-overview.qdoc

2026-05-07T16:18:05+00:00

Add an overview page to the documentation that introduces
the main features that are available in StyleKit.

Change-Id: Ib0a3146dec94e59fd016b22ae562185404b0f36e
Reviewed-by: Topi Reinio 
(cherry picked from commit a412104b5f911573dbe50ca6f663ca471888c7a6)
Reviewed-by: Qt Cherry-pick Bot

QQuickDrag: fix binding loop and re-entrancy for Automatic drag type

2026-05-06T22:45:18+00:00

When Drag.dragType is Automatic and Drag.active is bound to e.g.
DragHandler.active, calling setActive(true) previously invoked
startDrag() immediately, which in turn called QDrag::exec(). That
exec() call enters a nested event loop, which is incompatible with
being called from within a QML binding or JS expression: the QML engine
is still mid-evaluation when exec() blocks, so when the pointer release
arrives in the nested loop, deactivates the DragHandler, and causes the
binding to re-trigger, the engine detects a binding loop.

Fix this by deferring the startDrag() call via Qt::QueuedConnection so
that the current JS frame unwinds completely before exec() runs from a
clean event-loop context. An 'if (d->active)' guard in the deferred
lambda handles the case where the drag is cancelled before the queued
call fires.

The executingNativeDrag flag is now set/cleared around exec() inside
startDrag() itself (covering both the Automatic binding path and direct
QML calls to Drag.startDrag()). It suppresses re-entrant setActive(false)
calls that arrive via DragHandler deactivation while exec() is blocking,
since startDrag() already handles all cleanup when exec() returns.

Fixes: QTBUG-144006
Change-Id: I9bf6a4e6f3edea7e12e187b5756ab483c462696a
Reviewed-by: Fabian Kosmale 
Reviewed-by: Konsta Alajärvi 
Reviewed-by: Oliver Eftevaag 
(cherry picked from commit ae6e67e4cf23af6dbceab5e62881864b3a38c867)
Reviewed-by: Qt Cherry-pick Bot

Silence some static code checker complaints in qsg*

2026-05-06T16:39:53+00:00

Pick-to: 6.8
Axivion-Id: qt_Essentials_qtquick_dev_linux:SV1543
Axivion-Id: qt_Essentials_qtquick_dev_linux:SV1544
Axivion-Id: qt_Essentials_qtquick_dev_linux:SV1549
Axivion-Id: qt_Essentials_qtquick_dev_linux:SV1741
Axivion-Id: qt_Essentials_qtquick_dev_linux:SV1803
Axivion-Id: qt_Essentials_qtquick_dev_linux:SV3062
Axivion-Id: qt_Essentials_qtquick_dev_linux:SV3128
Axivion-Id: qt_Essentials_qtquick_dev_linux:SV3129
Axivion-Id: qt_Essentials_qtquick_dev_linux:SV3130
Axivion-Id: qt_Essentials_qtquick_dev_linux:SV3134
Axivion-Id: qt_Essentials_qtquick_dev_linux:SV3135
Axivion-Id: qt_Essentials_qtquick_dev_linux:SV3136
Axivion-Id: qt_Essentials_qtquick_dev_linux:SV3137
Change-Id: I4427a85cfa6050d43ccd74bd354af3301c802151
Reviewed-by: Christian Strømme 
(cherry picked from commit c570680474bcd5f098e1fda4c05bb46885e5bc3a)
Reviewed-by: Qt Cherry-pick Bot

QQuickTableView: respect QAIM::buddy() when editing cells

2026-05-06T11:38:24+00:00

When edit() is called, consult QAbstractItemModel::buddy() first to
resolve the target index. This allows the model to redirect editing
to a sibling cell, matching the behavior of other Qt item views like
QTreeView and QTableView.

The included test verifies that we now respect the buddy.
The checkEditAfterReorder() test also had to be modifed slightly.
It assigned a QVariant(QSharedPointer(QAIM)) as model to TableView,
and not the expected QVariant(QAIM). This strangly works in most
cases, but will now cause a warning in canEdit() since the variant
cannot be casted directly to a QAIM.

Change-Id: I01092228019c91212c601f104f5f2fa3274e74e0
Reviewed-by: Fabian Kosmale 
(cherry picked from commit b2af284eac4aa0e936c42c4c62a9fe14c9ab6916)
Reviewed-by: Qt Cherry-pick Bot

quickshapes: fix build with -qreal float

2026-05-05T17:12:08+00:00

Change-Id: Iffa5644856c8a70e6cbc584f1c007ee3143d926c
Reviewed-by: Eirik Aavitsland 
Reviewed-by: Alexey Zerkin 
(cherry picked from commit a1fc37c7d43f232e1f153af4fd18a4d21d45cf1c)
Reviewed-by: Qt Cherry-pick Bot

iOS style: Explicitly link against Objective-C runtime

2026-05-05T03:15:51+00:00

We don't link against any frameworks that automatically bring in
the Objective-C runtime, so we need to explicitly link it.

This was only seen in shared library builds.

Pick-to: 6.10
Change-Id: I06c7b31c7d158ac42ec685df55f2ee81c946ac23
Reviewed-by: Alexandru Croitor 
(cherry picked from commit 5cb49d6ef7b27257a6c8e14f104d8225a6dc746d)
Reviewed-by: Qt Cherry-pick Bot

tst_qquickmenu: Test exact submenu position only if scale is 1.0

2026-05-04T16:57:50+00:00

When a menu has a scale applied, as is the case for the iOS style when
the menu opens a submenu, the calculation of the exact position does
not hold. This will need to be fixed in the popup positioner, or
otherwise the style will have to find another workaround to achieve
the same visual effect.
Until that is fixed, skip the check if the menu sets a particular scale.

Fixes: QTBUG-146038
Change-Id: If1c51ba1671f0662e613df2d78e507fa95b01864
Reviewed-by: Marc Mutz 
Reviewed-by: Shawn Rutledge 
(cherry picked from commit 93b307724637447b28e992ac162c87bbf1662900)
Reviewed-by: Qt Cherry-pick Bot

Really fix default alias property after alias sorting

2026-05-04T08:05:58+00:00

The condition for fixing up the alias property index was wrong. Instead
of checking the last list element, it was checking the first element
twice.
To avoid further mistakes and to make the logic easier to reason about,
use std::find and std::distance to compute the index, and rely on the
compiler to potentially optimize the loops.

Amends 5b775e96c067995bf21cdf5a3641c50d5b7b272d

Fixes: QTBUG-144701
Change-Id: I589378b6cbc8d68f550ff7ec67be9a420ebee4d5
Reviewed-by: Jani Heikkinen 
(cherry picked from commit 4f28b5469dd8e847abb54b6fa0dd75c6ae0e2874)
Reviewed-by: Sami Shalayel

QQuickOverlay: fix compilation with -no-feature-quick-shadereffect

2026-05-01T20:44:23+00:00

A hard dependency to QQuickShaderEffectSource was not protected by
QT_CONFIG ifdefs, leading to compilation errors in -no-feature-quick-
shadereffect builds.

Add the missing ifdefs.

Amends ffcf191bb6400a7c978dc12b7b2315c839ac59d0.

Pick-to: 6.8
Change-Id: I513dc452d92a8e82824a0abd03b0c9b9c0d85e4e
Reviewed-by: Shawn Rutledge 
(cherry picked from commit d1e72d2ae922be1a9f71909373303b14b3ad6ec1)
Reviewed-by: Qt Cherry-pick Bot