diff options
| author | Thiago Macieira <thiago.macieira@intel.com> | 2020-11-18 07:21:05 -0800 |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@intel.com> | 2020-11-18 14:24:02 -0800 |
| commit | be0f1af3f1829da0d321c12dbd40d5743d3b2eb5 (patch) | |
| tree | 7013d45ae29f7fd92764f1414f852ece4cad591a /src | |
| parent | d91edd21d6a91eb50077e9e770b3646de8412669 (diff) | |
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>
Diffstat (limited to 'src')
| -rw-r--r-- | src/corelib/serialization/qcborcommon.h | 1 | ||||
| -rw-r--r-- | src/corelib/serialization/qcborstreamreader.h | 4 | ||||
| -rw-r--r-- | src/corelib/serialization/qcborstreamwriter.h | 4 | ||||
| -rw-r--r-- | 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 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 diff --git a/src/corelib/serialization/qcborstreamreader.h b/src/corelib/serialization/qcborstreamreader.h index 6d5feccfcf..3665b09ea8 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 f8c94ceb93..9c2f9e81ab 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 fd9f78a88d..9a26c9ab66 100644 --- a/src/corelib/serialization/qcborvalue.h +++ b/src/corelib/serialization/qcborvalue.h @@ -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 |