revert "QProcessEnvironment: simplify locking"
authorDebian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
Thu, 28 May 2026 21:30:55 +0000 (21:30 +0000)
committerRaspbian forward porter <root@raspbian.org>
Thu, 28 May 2026 21:30:55 +0000 (21:30 +0000)
commit45751af51ad1c6c66cd32f67d63c1e149dae6e6e
treeb90546aa729c80cc4367cae979d6281d59f637c5
parentf003d34616e4f467f7882658e185aab8b48a71e1
revert "QProcessEnvironment: simplify locking"

Origin: upstream, https://code.qt.io/cgit/qt/qtbase.git/commit?id=080d61c020678b75
Last-Update: 2026-01-29

This reverts commit c5d6b263c204cb09db2be36826e19acb03dc24fb.

The commit being reverted assumes the mutex is only protecting 'nameMap'
and nothing else is mutable, which is false. The mutex is not only
protecting 'nameMap' but also protecting the containing value objects,
since even though the value object is accessed read-only, its
implementation mutates its internal states for 2-way conversion between
ByteArray and QString.

Commit 85e61297f7b02297641826332dbdbc845a88c34b ("restore
QProcessEnvironment shared data thread safety on unix") said that
implicit sharing together with 'mutable' is a time bomb and the bomb is
triggered by the reverted commit.

Gbp-Pq: Name revert_simplify_locking.diff
src/corelib/io/qprocess.cpp
src/corelib/io/qprocess_p.h
src/corelib/io/qprocess_unix.cpp