[qt/qt/qtdeclarative]: 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/qtdeclarative
Pushed by mirror-service into branch '6.12'.
Changed from b6521f93124c7ec381cd0bf6330ddb4999a01f92 to 6e48ce14b4cd87d6d29fd0e036ba44cb1ac70a59
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 f118798234c6614ddfca6ccb8729c7ee6bb85e4d by Qt Cherry-pick Bot (on behalf of Tor Arne Vestbø) on 29/07/2026 at 08:13..
CMake: Remove QML plugin symlinks from Resources of deployed bundles

When deploying a QML app into a macOS app bundle we used to symlink each
module's plugin binary next to its qmldir under Resources/qml, because
the engine expected a module's qmldir and its plugin to live in the same
directory. The engine now locates plugins via the plugin search path
(QLibraryInfo's PluginsPath), so the symlink no longer serves a purpose,
and code signing disallows executable code under Resources anyway.

As the app bundle is installed by copying it wholesale, the build-tree
development symlinks we create for running from the build directory get
dragged along into the installed bundle. We now remove any such stale
plugin binary or symlink left next to the qmldir, leaving just the
qmldir under Resources/qml and the real plugin under PlugIns.

[ChangeLog][CMake] Deployed macOS app bundles no longer contain symlinks
to QML plugin binaries under Resources/qml. The plugins are deployed to
PlugIns and located via the plugin search path.

Task-number: QTBUG-101338
Change-Id: I9605cc6231683a028f2c2f021f10295e4947cdc8
Reviewed-by: Joerg Bornemann <[email protected]>
Reviewed-by: Fabian Kosmale <[email protected]>
Reviewed-by: Ulf Hermann <[email protected]>
(cherry picked from commit de1191bfc8174bd13f2cde8f4e9857970e29674a)
Reviewed-by: Qt Cherry-pick Bot <[email protected]>
https://invent.kde.org/qt/qt/qtdeclarative/-/commit/f118798234c6614ddfca6ccb8729c7ee6bb85e4d

Git commit da90a3462587a4da09edb2380e04614901c61426 by Qt Cherry-pick Bot (on behalf of Tor Arne Vestbø) on 29/07/2026 at 08:13..
CMake: Remove the pre-3.19 build-dir qt.conf fallback

The minimum supported CMake for building and using Qt is now 3.25, so
the code path that wrote out the build-dir qt.conf immediately, rather
than through cmake_language(DEFER), on CMake versions older than 3.19
can no longer be reached. Remove it, along with its helper
_qt_internal_writebuilddir_qtconf_nondeferred and the Qt6qt.conf.in
template that only that path used.

Task-number: QTBUG-101338
Change-Id: I8fb94ee9c5c7b6c78fed70692692772899a904d6
Reviewed-by: Fabian Kosmale <[email protected]>
Reviewed-by: Ulf Hermann <[email protected]>
Reviewed-by: Joerg Bornemann <[email protected]>
(cherry picked from commit e63476aafee01dfaa4db420840993e7c2755ce20)
Reviewed-by: Qt Cherry-pick Bot <[email protected]>
https://invent.kde.org/qt/qt/qtdeclarative/-/commit/da90a3462587a4da09edb2380e04614901c61426

Git commit 39430d02efd16bfa5a38d63ae300989b347f4308 by Qt Cherry-pick Bot (on behalf of Sami Shalayel) on 29/07/2026 at 08:30..
doc: replace directory import from qualified import snippet

The directory import does not seem to make sense here, the documentation
in directoryImports.qdoc states:

Directory Imports rank below any module imports in precedence. If the
same name is defined in a module and in a directory that are both
imported into the same namespace, only the module's type is made
available.

Replace the directory import which can't clash with QtQuick with a
QML module import.

Change-Id: I327895349ffed60e597c2a2e11b352d2fcfde5bd
Reviewed-by: Fabian Kosmale <[email protected]>
(cherry picked from commit bc07e9f850f8041892a438cca6198013a0137f19)
Reviewed-by: Qt Cherry-pick Bot <[email protected]>
https://invent.kde.org/qt/qt/qtdeclarative/-/commit/39430d02efd16bfa5a38d63ae300989b347f4308

Git commit 6e48ce14b4cd87d6d29fd0e036ba44cb1ac70a59 by Tor Arne Vestbø on 29/07/2026 at 08:33..
qmltyperegistrar: Preserve import path order when merging qt.conf files

The partial *_qt.part.conf files written for each executable list QML
import path roots, one per line, and are merged per directory into the
qt.conf placed next to the binary. Their order matters at run time: the
QML engine resolves a module against its import paths in order and uses
the first match, so of two paths providing the same module, the one
listed first wins.

The merge collected the paths in a QMultiHash and read them back with
values(), which returns them from the most recently inserted to the
least recently inserted. The merged qt.conf therefore listed the paths
in the reverse of the order they were written in, silently inverting the
precedence intended by whoever wrote the partial.

Collect them in a QHash of QStringList instead, so that the order within
each partial file is preserved. As a side effect each qt.conf is now
written once rather than once per import path, QMultiHash::keys() having
repeated every key once per value.

The order between separate partial files in the same directory remains
that of QDirIterator, and so arbitrary.

Add a test that drives mergeQtConfFiles() over a partial with a known
line order and checks both that the order survives and that duplicate
paths collapse onto their first occurrence.

Task-number: QTBUG-101338
Change-Id: I66c276fc66dded9ab4f15c6cbb65c647c654307f
Reviewed-by: Fabian Kosmale <[email protected]>
(cherry picked from commit b8307471411e798717c3aa51b37cbb2f57c4006c)
Reviewed-by: Tor Arne Vestbø <[email protected]>
https://invent.kde.org/qt/qt/qtdeclarative/-/commit/6e48ce14b4cd87d6d29fd0e036ba44cb1ac70a59
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.