CBOR: remove QT_X11_DEFINES_FOUND dead code

Amends commit be0f1af3f1829da0d321c12dbd40d5743d3b2eb5 ("CBOR: remove
the X11 True and False for good"), which removed the #define from the
top of the files, but didn't remove the checking of the macro from the
bottom of them.

Pick-to: 6.9
Change-Id: I92e76842a4117f6feed3fffdac2fcec01367101e
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
This commit is contained in:
Thiago Macieira 2025-02-12 22:37:49 -08:00
parent 4a4c425291
commit 00f3ca950a
4 changed files with 0 additions and 22 deletions

View File

@ -118,11 +118,4 @@ QT_END_NAMESPACE
QT_DECL_METATYPE_EXTERN(QCborTag, Q_CORE_EXPORT) QT_DECL_METATYPE_EXTERN(QCborTag, Q_CORE_EXPORT)
// To avoid changing namespace we need to reinstate defines, even though our .cpp
// will then have to remove them again.
#if defined(QT_X11_DEFINES_FOUND)
# define True 1
# define False 0
#endif
#endif // QCBORSTREAM_H #endif // QCBORSTREAM_H

View File

@ -210,9 +210,4 @@ private:
QT_END_NAMESPACE QT_END_NAMESPACE
#if defined(QT_X11_DEFINES_FOUND)
# define True 1
# define False 0
#endif
#endif // QCBORSTREAMREADER_H #endif // QCBORSTREAMREADER_H

View File

@ -88,9 +88,4 @@ private:
QT_END_NAMESPACE QT_END_NAMESPACE
#if defined(QT_X11_DEFINES_FOUND)
# define True 1
# define False 0
#endif
#endif // QCBORSTREAMWRITER_H #endif // QCBORSTREAMWRITER_H

View File

@ -625,9 +625,4 @@ Q_CORE_EXPORT QDataStream &operator>>(QDataStream &, QCborValue &);
QT_END_NAMESPACE QT_END_NAMESPACE
#if defined(QT_X11_DEFINES_FOUND)
# define True 1
# define False 0
#endif
#endif // QCBORVALUE_H #endif // QCBORVALUE_H