[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 '6.12'.
Changed from c30dc10efaf5aad70542b47e56214480aeb093ee to 2a3d589f944380b429a7e66b8e1ec3805fe63828
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 3ffbfc32457ad788d9ebad23e42483c3e4d38368 by Qt Cherry-pick Bot (on behalf of Tatiana Borisova) on 29/07/2026 at 02:24..
Fix a build issue
- If configure Qt with the following command:
cmake ../qt5/ -GNinja -DCMAKE_BUILD_TYPE=Release -DQT_BUILD_EXAMPLES=ON -DQT_BUILD_TESTS=ON
I observe the following issue on building:
qtbase/tests/auto/corelib/kernel/qvariant/relocatable_change.h:11:10: fatal error: QTest: No such file or directory
11 | #include <QTest>
| ^~~~~~~
Pick-to: 6.11
Change-Id: If01c39456a820b14e7a698bd91ef9c5baabbe978
Reviewed-by: Alexandru Croitor <[email protected]>
(cherry picked from commit 6c1a003dbd8b211fefd18b84842d7ffab701ca24)
Reviewed-by: Qt Cherry-pick Bot <[email protected]>
https://invent.kde.org/qt/qt/qtbase/-/commit/3ffbfc32457ad788d9ebad23e42483c3e4d38368
Git commit 2a3d589f944380b429a7e66b8e1ec3805fe63828 by Qt Cherry-pick Bot (on behalf of Tor Arne Vestbø) on 29/07/2026 at 08:12..
moc: Don't resolve bare includes via framework search paths
A framework include names its framework, as in <Framework/Header>, and
Clang never applies framework lookup to an include without a slash. In
51ff69a3e1210e10eb4fb562060d807e71645383 we taught moc to also try a
slash-less include as a possible framework umbrella header, so that
<QtCore> would keep resolving when the only include path pointing at
the module is -I $DIR/QtCore.framework.
That's too eager. The flag names one framework, but the search path we
derive from it is the directory holding it, and that directory holds
every other installed framework as well. A bare <QtWidgets> would then
resolve for any target that merely depends on QtCore, and moc would
disagree with the compiler about __has_include(<QtWidgets>).
We don't need the fallback. gcc and clang don't find the header
if the include/QtFoo directory is not passed as a header
alongside the framework, so we expect that buildsystems pass
the same information to moc. Consequently, an umbrella
include
resolves there, and the include path pointing into the bundle is still
turned into a framework search path, so a bare <QtCore> can not be
mistaken for the framework binary either.
Amends 51ff69a3e1210e10eb4fb562060d807e71645383.
Task-number: QTBUG-89545
Change-Id: Idc228db3e0ad422a104c85a100b9bf1d0820a231
Reviewed-by: Alexandru Croitor <[email protected]>
Reviewed-by: Fabian Kosmale <[email protected]>
(cherry picked from commit 09d4f9ace71d1c929589bb40486af597e6f7c6b2)
Reviewed-by: Qt Cherry-pick Bot <[email protected]>
https://invent.kde.org/qt/qt/qtbase/-/commit/2a3d589f944380b429a7e66b8e1ec3805fe63828