Change-Id: I897599d8002d4ca3eba924c47e24dcc4d80521bb
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>

Change-Id: I25baacde9c1f5f53345e0969f503e6dfe4acc252
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>

We may have additional bindings scheduled for the deep alias, but those
are to be overridden by the alias. They should therefore be removed like
bindings to target properties of shallow aliases.

For QProperty bindings we have to apply a separate trick and set and
clear the binding bit in the right places. We don't have access to the
actual binding when writing the value, after all.

Pick-to: 6.5 6.2
Fixes: QTBUG-115579
Change-Id: Ia915e59905d7e3185a17c5b6613926264ad9bc6b
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
(cherry picked from commit 0fdf9042ce36c1dcfed64d1600f1526ac176768d)

We cannot get the property cache for an inline component the usual way
during type compilation. We have to ask the compilation unit for it.
This will usually not work in 6.6 or earlier since the compilation unit
does not know the IC's metatypes. However, it shouldn't crash.

Guard against still not being able to retrieve the property cache for
any reason. Abort the compilation rather than crashing.

Also, unify the setting of property attributes. Those should really work
the same way everywhere.

Finally, disallow writing aliases to value type properties where the
property holding the value type itself is not writable.

Pick-to: 6.5 6.2
Task-number: QTBUG-115579
Change-Id: I029eb56a9a390085d0c696a787a64c48acf0d620
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
(cherry picked from commit 3ea55bf398412d373daab9c92b1498f45de70e96)

The quick table view can have both QAbstractItemModel and JS value
as its model. The table view release and load the items (or rebuild)
when its assigned with new model. The newmodel always be compared
with existing model before rebuild via
QQuickTableViewPrivate::syncModel. This comparison works with
QAbstractItemModel but the same fails with JS model.

This patch adds additional validation in
QQuickTableViewPrivate::syncModel and QQuickTableViewPrivate::setModel
for comparing JS model to avoid rebuild when existing model
overwritten with same model again.

Fixes: QTBUG-117917
Pick-to: 6.5 6.2
Change-Id: Ic15145c4b8998c68ae6471a2abf4aef727041eea
Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
(cherry picked from commit 79b34126850c4235a1914e95f8e4235cfddba007)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>

As it stood, TableView would rebuild the whole table if
we got a call to forceLayout before a pending
rowsInsertedCallback was delivered. This was far too
harsh, as we a RebuildOption::All will throw away all
existing delegates, and reset the contentItem back
to zero.

The correct thing to do, is to do the same that we
already do in rowsInsertedCallback; just schedule
RebuildOption::ViewportOnly. But since we don't
know what else might have changed, we now also need
to take the previous "else" case path in the function.

Pick-to: 6.5 6.2
Task-number: QTBUG-118897
Change-Id: I23fe30c7d9e6abf32a6565c18bd9249de459636c
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
Reviewed-by: Santhosh Kumar <santhosh.kumar.selvaraj@qt.io>
(cherry picked from commit a4ed13098d3995ab59e66d3ff5011e2b2014978f)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>

This follows 5c7a3ea783b780bc5f924849091f1f3ffb4b892c in qtbase.

On some platforms, such as Wayland (and also eglfs), manual window
positioning is not supported. Since this has caused confusion in the
past, we add a note to the documentation.

Pick-to: 6.5 6.2
Task-number: QTBUG-86780
Fixes: QTBUG-119024
Change-Id: I4a81257dee1b80176bef9fa56b1bdaeee2069eee
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
(cherry picked from commit bcd03432094e0b57f8d961278eb0e1a4c15971cc)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>

Fix QQuickLabsPlatformSystemTrayIcon::setMenu() logic to allow resetting
the tray icon menu. Now we correctly handle `nullptr` menu passed to the
function, and update underlying QPlatformSystemTrayIcon instance
accordingly.

Fixes: QTBUG-119065
Pick-to: 6.5
Change-Id: Ief6445f4854ff2f59809be315f373e0c1755652b
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
(cherry picked from commit 3ad1980ef5d07c23a00cb678ceab54a1d8ca1279)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>

This allows placeholder text to follow the Alignment set to
the TextField or TextArea components when using Material style.
The placeholder text will float to the left, right, or center
depending on the alignment set, and the arc will be drawn properly
in case of Material.Outline container style.

Fixes: QTBUG-118856
Pick-to: 6.5
Change-Id: Ic9cede806dc2f6109e7e2c4b2b2fc960d9c6a1b6
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
(cherry picked from commit 7e678acbb6167218d349c49436499121b2025af5)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>

The texteditor is made to open text, and in this case it makes sense to
pass the Text flag to the QFile::open call in the example code.

Pick-to: 6.5
Task-number: QTBUG-118636
Change-Id: I936610945aa6e2f67b29ce6f5c559a2b942fc718
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
Reviewed-by: Olivier De Cannière <olivier.decanniere@qt.io>
(cherry picked from commit 743065d7fe2337aa7229a9ea6d4f9b3c30fa1af0)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>