[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 'dev'. Changed from a9d6fb7dabd5a3cee8efe4a23c2162f0ad354b57 to b8307471411e798717c3aa51b37cbb2f57c4006c 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 b8307471411e798717c3aa51b37cbb2f57c4006c by Tor Arne Vestbø on 28/07/2026 at 22:18.. 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 Pick-to: 6.12 Change-Id: I66c276fc66dded9ab4f15c6cbb65c647c654307f Reviewed-by: Fabian Kosmale <[email protected]> https://invent.kde.org/qt/qt/qtdeclarative/-/commit/b8307471411e798717c3aa51b37cbb2f57c4006c