From be0f1af3f1829da0d321c12dbd40d5743d3b2eb5 Mon Sep 17 00:00:00 2001
From: Thiago Macieira <thiago.macieira@intel.com>
Date: Wed, 18 Nov 2020 07:21:05 -0800
Subject: CBOR: remove the X11 True and False for good

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>
---
 src/corelib/serialization/qcborcommon.h | 1 -
 1 file changed, 1 deletion(-)

(limited to 'src/corelib/serialization/qcborcommon.h')

diff --git a/src/corelib/serialization/qcborcommon.h b/src/corelib/serialization/qcborcommon.h
index 1e33a5bae4..2ea0cec44c 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
-- 
cgit v1.2.3