[qt/qt/qtbase]: Summary of bulk changes made

Git repository change summary for qt/qt/qtbase
Pushed by mirror-service into branch '6.12'.
Changed from a39bc0391fbcc29cf9f72bfe00cedab051c9828f to cba13f2c753361a08891cdebe5fe785018321006
Acknowledgement was received that this change introduces only existing code that has been pushed to another public open source repository.

This change contains the following new commits:

Git commit c247737b256d45497174a91df0b5dc64675b7f5d by Qt Cherry-pick Bot (on behalf of Laszlo Agocs) on 13/08/2026 at 21:12..
rhi: Simplify comment

Follow up to the previous hotfix.

Amends 4e3651acbdb0f982fc3eb1e47fd7aadcef81424c

Change-Id: I8eefefda7b3278f1a98055af7b67f8d661110336
Reviewed-by: MohammadHossein Qanbari <[email protected]>
(cherry picked from commit c09b42ead69a58edb15fd7c63004eada75b0ed9f)
Reviewed-by: Qt Cherry-pick Bot <[email protected]>
https://invent.kde.org/qt/qt/qtbase/-/commit/c247737b256d45497174a91df0b5dc64675b7f5d

Git commit 64e1307d5388952c83067ecaf3e61162f84caaf7 by Qt Cherry-pick Bot (on behalf of Marc Mutz) on 13/08/2026 at 21:12..
QSslKeyingMaterial: make the class extendable

Almost everything in the class was inline, so the type was not
extensible.

This author doesn't claim to know whether this class _needs_ to be
extensible, but RFCs change over time, so better be safe than sorry.

Add a void *m_reserved that can later take a d-pointer, and drag all
functions that conceptually need to access the complete state of the
object behind the ABI boundary:

- ctors, dtor, copy SMFs
- isValid()
- comparesEqual()
- qHash/op<< (already were)

As usual, the move SMFs and swap() can (and should) remain inline.

The default ctor loses its (implicit) noexcept by de-inlining, which
is as intended, as it might need to allocate once we take m_reserved
into use. Ditto copy SMFs.

Most functions can ignore the reserved member for now, with the
notable exception that all ctors need to init it to nullptr (ensured
by using NSDMI) and that swap and the inline move SMFs handle it like
a d-pointer (swap() and exchange(), resp.).

Not adding docs for the newly-declared SMFs, since technically
speaking they're not new. Also, IIRC, qdoc already default-documents
SMFs, so anything we could write here would just run the risk of
being inconsistent with the rest of Qt.

Found in API-review.

Fixes: QTBUG-144744
Change-Id: Ica18180f6539c63d79db6e6eb6a93f22d391088d
Reviewed-by: Ivan Solovev <[email protected]>
(cherry picked from commit 664625839b8f15cb465ae8e9642bc39290e07c7c)
Reviewed-by: Qt Cherry-pick Bot <[email protected]>
https://invent.kde.org/qt/qt/qtbase/-/commit/64e1307d5388952c83067ecaf3e61162f84caaf7

Git commit eef1ca112a62fd1e2bfccbc81a4bcdc095559c6e by Qt Cherry-pick Bot (on behalf of Marc Mutz) on 13/08/2026 at 21:12..
androidtestrunner: don't funnel chrono::milliseconds through legacy int API

QThread::sleep() is overloaded for chrono types since Qt 6.6. Use that
overload and pass the interval milliseconds object directly instead of
decomposing it into an int by calling count().

There's still the potential for overflow through the ms -> ns implicit
conversion, so push that narrowing up to callers by using nanoseconds
instead of milliseconds.

Amends d961c33f881c18ead3118a1510080235a0b5c948 (picked to 6.12).

Change-Id: Ibfb72b8d409294add7796b35b434afcd730f08de
Reviewed-by: Ivan Solovev <[email protected]>
(cherry picked from commit 9ba7582231d3abe67a63ee5d7e968909b63f8001)
Reviewed-by: Qt Cherry-pick Bot <[email protected]>
https://invent.kde.org/qt/qt/qtbase/-/commit/eef1ca112a62fd1e2bfccbc81a4bcdc095559c6e

Git commit 81edaa223fe825683487cac4b3859a97921eb25a by Qt Cherry-pick Bot (on behalf of Marc Mutz) on 13/08/2026 at 21:12..
QSslKeyingMaterial: don't mark the QByteArray getters noexcept

While the noexcept here, in this day and age, is not a lie, we
shouldn't tie ourselves to a particular design of implicitly-shared
types, and raise wrong expectations in our users, by marking such
functions noexcept, so remove them from these inline functions on
which they have no effect at all, anyway.

Found in API-review.

Task-number: QTBUG-144744
Change-Id: Ibeb07ebd216643cf16c40ccc27fa27da85af5196
Reviewed-by: Volker Hilsheimer <[email protected]>
Reviewed-by: Mårten Nordheim <[email protected]>
(cherry picked from commit 024c684ff0bff67328b0c091847f8e5c447254a6)
Reviewed-by: Qt Cherry-pick Bot <[email protected]>
https://invent.kde.org/qt/qt/qtbase/-/commit/81edaa223fe825683487cac4b3859a97921eb25a

Git commit eab302b61a4f42ab731f19b513ce3c2bdf178168 by Qt Cherry-pick Bot (on behalf of Marc Mutz) on 13/08/2026 at 21:12..
QMultiMap: fix take() copy-instead-of-move regression

Amends 1607b6b512961ef53c9d1aacbf7b086497f6fb49 (picked to 6.8), which
lost the std::move() on mapped().

Unfortunately, mapped() isn't overloaded on value-category, it always
returns an lvref, which neither RVOs nor binds to a move constructor.
So, despite return std::move(~~~) looking fishy, it's needed here.

Re-add it.

Pick-to: 6.11 6.8
Task-number: QTBUG-146948
Task-number: QTBUG-145948
Change-Id: I9360c75602370ff1a9702e1f5af4b12862503caf
Reviewed-by: Thiago Macieira <[email protected]>
Reviewed-by: Tim Blechmann <[email protected]>
(cherry picked from commit 5e4712c152c4681d9acccce51dd68ce40f885ffe)
Reviewed-by: Qt Cherry-pick Bot <[email protected]>
https://invent.kde.org/qt/qt/qtbase/-/commit/eab302b61a4f42ab731f19b513ce3c2bdf178168

Git commit 341235cbf2889480257cd155a4dc63818d2a9e94 by Qt Cherry-pick Bot (on behalf of Alexandru Croitor) on 13/08/2026 at 21:12..
CMake: Add CycloneDX needle assertions to the SBOM tests

The SBOM tests could only assert that a string is present or absent
in the generated SPDX tag value document. There was no equivalent for
the CycloneDX document.

Add add_assert_str_exists_in_cydx_v1_6_doc and its _not_ counterpart,
so that tests can check the contents of both documents.

Pick-to: 6.11 6.8
Change-Id: Iaf7f33e71a40cb47657e5228a6016e4a2a1463e7
Reviewed-by: Joerg Bornemann <[email protected]>
(cherry picked from commit 13c82154a960023fd65ed3effae93eba90b98d67)
Reviewed-by: Qt Cherry-pick Bot <[email protected]>
https://invent.kde.org/qt/qt/qtbase/-/commit/341235cbf2889480257cd155a4dc63818d2a9e94

Git commit cba13f2c753361a08891cdebe5fe785018321006 by Qt Cherry-pick Bot (on behalf of Alexandru Croitor) on 13/08/2026 at 21:12..
CMake: Fix stale attribution variable handling for nested sbom entries

A nested qt_attribution SBOM entry version can sometimes accidentally
inherit the PURL and CPE of a parent entry (module the version),
because the parent's variables in the calling scope are not unset.

This change unsets the attribution variables before each nested
_qt_internal_sbom_add_target call, so that only the attribution values
of the current entry are taken into account.

Added a test to verify this.

Pick-to: 6.11 6.8
Fixes: QTBUG-148710
Change-Id: Icb5e17941c598d0d066e28220066d3b4e61c5181
Reviewed-by: Joerg Bornemann <[email protected]>
(cherry picked from commit f395078d2b560b7a25dc8a98d90cb6d643efedaa)
Reviewed-by: Qt Cherry-pick Bot <[email protected]>
https://invent.kde.org/qt/qt/qtbase/-/commit/cba13f2c753361a08891cdebe5fe785018321006