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

Unity-build: exclude qrandom.cpp (#undef's Q_ASSERT/_X())

Browse Source 
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 <joerg.bornemann@qt.io>
(cherry picked from commit 093a0b4f6ee8f31b059ae83e5526d0da037dbd8e)
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 8527913a0c
commit 8b1f858f65
1 changed files with 1 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/corelib/CMakeLists.txt
View File

@ -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