From 90621fb3d5c4f40ba8914bf39a5b8f693ef8ad8d Mon Sep 17 00:00:00 2001
From: root <root@localhost.localdomain>
Date: Fri, 8 Jul 2022 11:23:57 +0800
Subject: [PATCH] remove-the-X11-True-and-False

---
 src/corelib/serialization/qcborcommon.h       | 1 -
 src/corelib/serialization/qcborstreamreader.h | 4 ++--
 src/corelib/serialization/qcborstreamwriter.h | 4 ++--
 src/corelib/serialization/qcborvalue.h        | 4 ++--
 4 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/src/corelib/serialization/qcborcommon.h b/src/corelib/serialization/qcborcommon.h
index bec46399..625af982 100644
--- a/src/corelib/serialization/qcborcommon.h
+++ b/src/corelib/serialization/qcborcommon.h
@@ -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
diff --git a/src/corelib/serialization/qcborstreamreader.h b/src/corelib/serialization/qcborstreamreader.h
index 6d5feccf..3665b09e 100644
--- a/src/corelib/serialization/qcborstreamreader.h
+++ b/src/corelib/serialization/qcborstreamreader.h
@@ -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
diff --git a/src/corelib/serialization/qcborstreamwriter.h b/src/corelib/serialization/qcborstreamwriter.h
index f8c94ceb..9c2f9e81 100644
--- a/src/corelib/serialization/qcborstreamwriter.h
+++ b/src/corelib/serialization/qcborstreamwriter.h
@@ -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
diff --git a/src/corelib/serialization/qcborvalue.h b/src/corelib/serialization/qcborvalue.h
index aa51e5da..4dc4ed69 100644
--- a/src/corelib/serialization/qcborvalue.h
+++ b/src/corelib/serialization/qcborvalue.h
@@ -53,8 +53,8 @@
 #include <QtCore/qvariant.h>
 #include <QtCore/qvector.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
-- 
2.31.1