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

KDE Git Services - Bulk Change <[email protected]>
Newsgroups gmane.comp.kde.cvs
Message-ID <[email protected]>
Git repository change summary for qt/qt/qtbase
Pushed by mirror-service into branch 'dev'.
Changed from 8d096c88bdb780e9c589498efceaa575991f59d2 to 8b3654cb64ca59f531867ef04352eab059f48973
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 b299ec64b12e002fa8b2173dee82b2fe91cdf6bf by Tor Arne Vestbø on 06/08/2026 at 18:32..
QLibraryInfo: Only report app paths first when a qt.conf says so

QLibraryInfo serves two use cases that want different answers from the
same call: "where does the Qt I run against live", which is what Qt's
own tools ask, and "where are my own resources", which is what an
application asks. As path() reports the first path only, whichever
prefix we report first decides who gets the wrong answer.

The bundle-aware work reported the application-prefixed paths first, for
any bundled application, and for any application with a qt.conf. Qt
Designer then started looking for the Assistant binary inside its own
bundle, and a development build of a bundled application, before its
qt.conf is in place, lost track of the Qt it was built against. In a Qt
Creator built from source that is its QML import path, the qmlls binary,
the qsb binary used to bake Effect Composer shaders, and its
translations.

We now report the paths a qt.conf lists explicitly first, as they are
the only ones anyone declared, and group the rest by the prefix they are
rooted at, letting the qt.conf decide which group comes first. A
user-written qt.conf keeps its long-standing exclusivity: the
application declares the layout it follows, and we report nothing of the
Qt build. Without one the Qt paths come first, followed by the paths the
application's own layout implies, so that both are available to the
plugin and QML module lookups we do via paths() ourselves.

A qt.conf that merges with the Qt build defaults is not a description of
the application's layout, but an overlay generated by Qt QML's build
machinery, and contributes only the locations it lists. That is what the
MergeQtConf marker meant before we dropped it in
3dff7f394454a992c42ba54154d2b6dae0a81481, on the assumption that an
extra application-rooted entry no one configured is harmless. It is not,
as the paths are consumed via path() rather than as a list of candidate
locations.

Being a bundle is not a statement about where Qt content was deployed
either, so a bundle on its own now only implies the modern Apple
suffixes, which is what the deployment machinery populates. The Unixy
suffixes at the application prefix are back to requiring a qt.conf, as
they did before this series, and a bundle that deploys Qt into itself
still reports them via the Qt prefix.

Task-number: QTBUG-148751
Pick-to: 6.12
Change-Id: I0bbd056185cdcc19fe7b30e13fce523881a727dc
Reviewed-by: Fabian Kosmale <[email protected]>
https://invent.kde.org/qt/qt/qtbase/-/commit/b299ec64b12e002fa8b2173dee82b2fe91cdf6bf

Git commit 9859bfe7042481d5a0e024aabde722abdeb1d12b by Ivan Solovev on 06/08/2026 at 18:32..
QTimeZone/tz: fix fallback to the legacy zoneinfo directory

Due to a copy-paste error, the code was never actually falling back
to using the legacy /usr/lib/zoneinfo path.

Fix by using the proper variable.

This is a regression caused by 569dc0de50a46b64763921199a2706ab34d151a9.

The original patch was picked down to 6.5, but this is not a security
issue, so not suitable for ESM branches.

Pick-to: 6.12 6.11 6.8
Change-Id: I06f3d742a495c9ed21d1a433e1ab73a3c075b8e1
Reviewed-by: Edward Welbourne <[email protected]>
https://invent.kde.org/qt/qt/qtbase/-/commit/9859bfe7042481d5a0e024aabde722abdeb1d12b

Git commit 69964540bf8b5284b94ed582cfdc20f117037d70 by David Boddie (on behalf of Jaishree Vyas) on 06/08/2026 at 19:02..
Doc: Change \page to \group for better user experience

When the user clicks any link on that page, it will go to a new page.
This new page will usually have a list of pages to go to that the
user can click. But it doesn't link back to the same page. \group will
change that experience.

Pick-to: 6.11 6.12
Task-number: QTBUG-104500
Change-Id: I0a8450b2e19d25a094cd3c2c91fab133e5627fa4
Reviewed-by: David Boddie <[email protected]>
https://invent.kde.org/qt/qt/qtbase/-/commit/69964540bf8b5284b94ed582cfdc20f117037d70

Git commit 8b3654cb64ca59f531867ef04352eab059f48973 by André Klitzing on 06/08/2026 at 19:02..
Add logging for entitlements files of macdeployqt

That information is missing in logfile but it is
important for debugging codesign issues.

Pick-to: 6.12
Change-Id: I3dfd59d377cc8c3e89004fe2d9a77043f2b7df27
Reviewed-by: Tor Arne Vestbø <[email protected]>
https://invent.kde.org/qt/qt/qtbase/-/commit/8b3654cb64ca59f531867ef04352eab059f48973
lmpx.com only provides a reader for public news (NNTP) servers. It is not affiliated with the servers or forums shown here and is not responsible for the content of articles, which is written by their respective authors.