From 8b1f858f65b796fdce2b1c3226db99ff4b5ac85f Mon Sep 17 00:00:00 2001 From: Marc Mutz Date: Mon, 3 Jul 2023 18:53:25 +0200 Subject: [PATCH] Unity-build: exclude qrandom.cpp (#undef's Q_ASSERT/_X()) qrandom.cpp #undef's Q_ASSERT/_X(), breaking TUs that happen to use it after qrandom.cpp has processed. Exclude it. Fixes: QTBUG-115031 Change-Id: Ie419f4ed2323f9c9e91f4dceaf8fecc097673d0e Reviewed-by: Joerg Bornemann (cherry picked from commit 093a0b4f6ee8f31b059ae83e5526d0da037dbd8e) Reviewed-by: Qt Cherry-pick Bot --- src/corelib/CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/src/corelib/CMakeLists.txt b/src/corelib/CMakeLists.txt index 0ddb896967f..f84d3b80bb7 100644 --- a/src/corelib/CMakeLists.txt +++ b/src/corelib/CMakeLists.txt @@ -317,6 +317,7 @@ qt_internal_add_module(Core text/qlocale.cpp text/qlocale.h global/qglobal.cpp # undef qFatal global/qlogging.cpp # undef qFatal/qInfo/qDebug + global/qrandom.cpp # undef Q_ASSERT/_X text/qstringconverter.cpp # enum Data tools/qcryptographichash.cpp # KeccakNISTInterface/Final io/qdebug.cpp # undef qDebug