diff options
-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 |