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

CBOR: remove the X11 True and False for good

Browse Source 
I don't care if you still need X11 headers. If you do, you know your
workarounds.

Pick-to: 5.15
Fixes: QTBUG-88591
Change-Id: If51855da004b4f3fbf43fffd1648a357eab2d865
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
This commit is contained in:
Thiago Macieira 2020-11-18 07:21:05 -08:00
parent d91edd21d6
commit be0f1af3f1
4 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/corelib/serialization/qcborcommon.h
View File

@ -50,7 +50,6 @@
/* X11 headers use these values too, but as defines */
#if defined(False) && defined(True)
# define QT_X11_DEFINES_FOUND 1
# undef True
# undef False
#endif

4
src/corelib/serialization/qcborstreamreader.h
View File

@ -49,8 +49,8 @@
QT_REQUIRE_CONFIG(cborstreamreader);
// See qcborcommon.h for why we check
#if defined(QT_X11_DEFINES_FOUND)
/* X11 headers use these values too, but as defines */
#if defined(False) && defined(True)
# undef True
# undef False
#endif

4
src/corelib/serialization/qcborstreamwriter.h
View File

@ -51,8 +51,8 @@
QT_REQUIRE_CONFIG(cborstreamwriter);
// See qcborcommon.h for why we check
#if defined(QT_X11_DEFINES_FOUND)
/* X11 headers use these values too, but as defines */
#if defined(False) && defined(True)
# undef True
# undef False
#endif

4
src/corelib/serialization/qcborvalue.h
View File

@ -52,8 +52,8 @@
#include <QtCore/quuid.h>
#include <QtCore/qvariant.h>
// See qcborcommon.h for why we check
#if defined(QT_X11_DEFINES_FOUND)
/* X11 headers use these values too, but as defines */
#if defined(False) && defined(True)
# undef True
# undef False
#endif