From ab5e8bc6784cee6ec4bcc42968cf4278aa46ac86 Mon Sep 17 00:00:00 2001 From: Marc Mutz Date: Wed, 11 Dec 2024 14:51:43 +0100 Subject: [PATCH] qresource.cpp: fix -unity-build MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit GCC 14 complains: In file included from unity_0_cxx.cxx:121: qresource.cpp:283:7: error: ‘QResourcePrivate’ has a field ‘QList<{anonymous}::QResourceRoot*> QResourcePrivate::related’ whose type has internal linkage [-Werror=subobject-linkage] 283 | class QResourcePrivate { | ^~~~~~~~~~~~~~~~ (Hot-)fix by adding qresource.cpp to NO_UNITY_BUILD_SOURCES. Amends fe6dda9bb9310878b408b2421f60acb7135bd8ba. Task-number: QTBUG-132114 Change-Id: Ic414d1cf9e4dad94d4263b3657d31df896c4e417 Reviewed-by: Joerg Bornemann Reviewed-by: Thiago Macieira (cherry picked from commit 57fab6a1c2df8f52b25f6db4017bb3acfa8e0526) Reviewed-by: Qt Cherry-pick Bot (cherry picked from commit 00f6df326fdfc2f31501ddb90fadfc3f3f245e6a) --- src/corelib/CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/src/corelib/CMakeLists.txt b/src/corelib/CMakeLists.txt index b6efde6f059..30ff8653411 100644 --- a/src/corelib/CMakeLists.txt +++ b/src/corelib/CMakeLists.txt @@ -328,6 +328,7 @@ qt_internal_add_module(Core text/qstringconverter.cpp # enum Data tools/qcryptographichash.cpp # KeccakNISTInterface/Final io/qdebug.cpp # undef qDebug + io/qresource.cpp # QTBUG-132114 NO_PCH_SOURCES compat/removed_api.cpp global/qsimd.cpp