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

Git repository change summary for qt/qt/qtbase
Pushed by mirror-service into branch 'dev'.
Changed from 6eed7d2814205cbc4127a7f544be9cb509cd04ba to 69b293676d702b4021b60fe7148a21808437c90b
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 c3dea84d855cff46b36515f2692842c359ec5d42 by Zbigniew Chyla on 18/07/2026 at 18:55..
ohos: kill QOhosOptional alias use in render/ files

The QOhosOptional<T> alias for std::optional<T>, together with its
makeQOhosOptional() and makeEmptyQOhosOptional() helpers, is being
eliminated in favor of using std::optional directly.

Replace every remaining use in src/plugins/platforms/ohos/render/ with
plain std::optional and add <optional> includes where the type is used
and the paired header does not already provide one.

Drop the now-unused qohosplugincore.h include from the headers where
QOhosOptional was the only symbol taken from it.

Task-number: QTBUG-147543
Pick-to: 6.12
Change-Id: I586d5e61244dae80edac8888f0f5b5a69fb14685
Reviewed-by: Dawid Śliwa <[email protected]>
Reviewed-by: Liang Qi <[email protected]>
https://invent.kde.org/qt/qt/qtbase/-/commit/c3dea84d855cff46b36515f2692842c359ec5d42

Git commit 96b9ad4fff089f414c215193d0eec5b9cb2dae67 by David Faure on 18/07/2026 at 19:17..
QReadWriteLock: fix describeState() dereferencing a non-pointer

d_ptr counts readers beyond the first in the upper bits, so a lock held
for read by N readers encodes as StateLockedForRead + (N-1) * Counter.
The `u < StateMask` guard only caught the single-reader case and treated
any larger value as a QReadWriteLockPrivate *, dereferencing it: with two
readers we locked a std::mutex at 0x11 + 0x80.

Test the state bits instead, as stateForWaitCondition() did before
1fa7779a51a merged the two functions. A real private is always aligned,
so its low two bits are zero; any value with a state bit set is encoded.

This crashed in any build via QWaitCondition::wait(), and in TSan builds
on every unlock() of a lock held by two or more readers.

Amends commit 1fa7779a51a38defaf5034cb45f7761f7e364aff

Pick-to: 6.12
Change-Id: I832e14c1f3fd052eda0b19b6ecbb48529e8c1b7e
Reviewed-by: Thiago Macieira <[email protected]>
https://invent.kde.org/qt/qt/qtbase/-/commit/96b9ad4fff089f414c215193d0eec5b9cb2dae67

Git commit 69b293676d702b4021b60fe7148a21808437c90b by Marc Mutz (on behalf of David Faure) on 18/07/2026 at 19:17..
testlib: fix duplicated word in comment

Amends 072e5d2a8f757a0c45d4474075294961ae0e89e2 (picked to 6.2).

Pick-to: 6.12 6.11 6.8
Change-Id: Ie40e1966f65883b9de6f95c1db7dced98dc2e07d
Reviewed-by: Marc Mutz <[email protected]>
https://invent.kde.org/qt/qt/qtbase/-/commit/69b293676d702b4021b60fe7148a21808437c90b