[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 bbfa0d188d2599459413fc3659540e11648c1718 to 7b53f661f76597dd127189e5494abc93d005a093
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 7bbf8b108987369e45bcfabe370389d6341a0cea by Qt Cherry-pick Bot (on behalf of Tor Arne Vestbø) on 18/08/2026 at 22:51..
CMake: Test that a build-dir qt.conf still points to Qt's own tools
The qt.conf we generate next to an executable in the build tree lists
only the QML import roots of the modules the executable needs, but its
mere presence used to make QLibraryInfo report application-prefixed
paths for every other location as well, ahead of the Qt-prefixed ones.
Code that asks for a single path, to find Qt's binaries or helper
tools, then no longer found them.
Both tests now have a data-driven qtToolPaths(), comparing
QLibraryInfo::path() for BinariesPath and LibraryExecutablesPath
against the corresponding directories of the Qt build. The expected
paths come in from CMake, as the test has no other way to tell a
Qt-prefixed path from an app-prefixed one.
tst_non_bundle is the platform-independent witness, where the qt.conf
is the only thing bringing in app-prefixed paths. tst_qml_only_import
builds as a bundle on Apple platforms, where the bundle prefix implies
the modern bundle suffixes ("MacOS", "Helpers") on its own.
Task-number: QTBUG-148751
Change-Id: Ib8b748bd39fef24f66d3b8dcb21bf1342e8034cb
Reviewed-by: Alexandru Croitor <[email protected]>
(cherry picked from commit 4be1b1671ff5d09ff59e43499b1a2061b3dc2b3a)
Reviewed-by: Qt Cherry-pick Bot <[email protected]>
https://invent.kde.org/qt/qt/qtdeclarative/-/commit/7bbf8b108987369e45bcfabe370389d6341a0cea
Git commit 7b53f661f76597dd127189e5494abc93d005a093 by Qt Cherry-pick Bot (on behalf of Tor Arne Vestbø) on 18/08/2026 at 22:51..
CMake: Use the shared scanner entry parser in QML deploy support
The deploy support script carried its own copy of
_qt_internal_parse_qml_imports_entry(), predating the move of the macro
to Qt6QmlPublicCMakeHelpers.cmake in
dc27fcdaf26cca3fadc92cd0c9aa5398e6b0e774. The helpers file is installed
next to the deploy support script, so we can include it directly, the
same way Qt6WriteQtConfPart.cmake does.
The copy did not know about the PREFER, COMPONENTS and SCRIPTS keywords,
so those ended up in the entry's unparsed arguments. Nothing read them,
and the fields the script does use are parsed the same either way.
Task-number: QTBUG-101338
Change-Id: I99b6df3c25373d3772542b6e2e264ee107a22fa9
Reviewed-by: Alexandru Croitor <[email protected]>
(cherry picked from commit e0eaf2eddcf6ae581cc641eec0634c82c13fe94d)
Reviewed-by: Qt Cherry-pick Bot <[email protected]>
https://invent.kde.org/qt/qt/qtdeclarative/-/commit/7b53f661f76597dd127189e5494abc93d005a093