1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Unity-build: exclude qdebug.cpp (#undef's qDebug())

Browse Source 
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 <volker.hilsheimer@qt.io>
(cherry picked from commit b8dd99a1b2bc02abd2f0c48c38b336b58d3e0721)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Marc Mutz 2023-07-03 18:53:25 +02:00 committed by Qt Cherry-pick Bot
parent 583065c533
commit fd1be66d16
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

@ -316,9 +316,10 @@ qt_internal_add_module(Core
tools/qshareddata.cpp tools/qshareddata.h tools/qshareddata.cpp tools/qshareddata.h
text/qlocale.cpp text/qlocale.h text/qlocale.cpp text/qlocale.h
global/qglobal.cpp # undef qFatal global/qglobal.cpp # undef qFatal
global/qlogging.cpp # undef qFatal global/qlogging.cpp # undef qFatal/qInfo/qDebug
text/qstringconverter.cpp # enum Data text/qstringconverter.cpp # enum Data
tools/qcryptographichash.cpp # KeccakNISTInterface/Final tools/qcryptographichash.cpp # KeccakNISTInterface/Final
io/qdebug.cpp # undef qDebug
NO_PCH_SOURCES NO_PCH_SOURCES
compat/removed_api.cpp compat/removed_api.cpp
global/qsimd.cpp global/qsimd.cpp