whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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.

Pick-to: 6.6 6.5
Task-number: QTBUG-115031
Change-Id: I4c910f051f1578f27cac8e5e6b358e7ee2eeb97e
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
bb10
Marc Mutz 2023-07-03 18:53:25 +02:00
parent d49c19b216
commit b8dd99a1b2
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/corelib/CMakeLists.txt
View File

@ -313,9 +313,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