From fd1be66d169f0af63a90ce145beb600764d00a37 Mon Sep 17 00:00:00 2001 From: Marc Mutz Date: Mon, 3 Jul 2023 18:53:25 +0200 Subject: [PATCH] Unity-build: exclude qdebug.cpp (#undef's qDebug()) Like qlogging.cpp, qdebug.cpp also #undef's qDebug, breaking TUs that happen to use it after qdebug.cpp has processed. Exclude it. In CMakeLists.txt, also mention qlogging.cpp undef's qInfo() and qDebug(), too. Task-number: QTBUG-115031 Change-Id: I4c910f051f1578f27cac8e5e6b358e7ee2eeb97e Reviewed-by: Volker Hilsheimer (cherry picked from commit b8dd99a1b2bc02abd2f0c48c38b336b58d3e0721) Reviewed-by: Qt Cherry-pick Bot --- src/corelib/CMakeLists.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/corelib/CMakeLists.txt b/src/corelib/CMakeLists.txt index 9463e27485d..0ddb896967f 100644 --- a/src/corelib/CMakeLists.txt +++ b/src/corelib/CMakeLists.txt @@ -316,9 +316,10 @@ qt_internal_add_module(Core tools/qshareddata.cpp tools/qshareddata.h text/qlocale.cpp text/qlocale.h global/qglobal.cpp # undef qFatal - global/qlogging.cpp # undef qFatal + global/qlogging.cpp # undef qFatal/qInfo/qDebug text/qstringconverter.cpp # enum Data tools/qcryptographichash.cpp # KeccakNISTInterface/Final + io/qdebug.cpp # undef qDebug NO_PCH_SOURCES compat/removed_api.cpp global/qsimd.cpp