From: Ivailo Monev Date: Sat, 3 Oct 2020 21:01:09 +0000 (+0300) Subject: QT_MOC_CPP is never defined so remove checks for it in qglobal header X-Git-Tag: 4.12.0~3517 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=c1118b0c6f13dc8171a5cab3f871f099f69703f8;p=kde%2FKatie.git QT_MOC_CPP is never defined so remove checks for it in qglobal header Signed-off-by: Ivailo Monev --- diff --git a/src/core/global/qglobal.h b/src/core/global/qglobal.h index fbe20ef4a..5552cd34c 100644 --- a/src/core/global/qglobal.h +++ b/src/core/global/qglobal.h @@ -271,11 +271,9 @@ QT_USE_NAMESPACE # define Q_LIKELY(expr) __builtin_expect(!!(expr), true) # define Q_UNLIKELY(expr) __builtin_expect(!!(expr), false) # define Q_FUNC_INFO __PRETTY_FUNCTION__ -# if !defined(QT_MOC_CPP) -# define Q_PACKED __attribute__ ((__packed__)) -# ifndef __ARM_EABI__ -# define QT_NO_ARM_EABI -# endif +# define Q_PACKED __attribute__ ((__packed__)) +# ifndef __ARM_EABI__ +# define QT_NO_ARM_EABI # endif # if __cplusplus >= 201103L || defined(__GXX_EXPERIMENTAL_CXX0X__) /* C++0x features supported in GCC 4.3: */ @@ -302,9 +300,7 @@ QT_USE_NAMESPACE # define Q_LIKELY(expr) __builtin_expect(!!(expr), true) # define Q_UNLIKELY(expr) __builtin_expect(!!(expr), false) # define Q_FUNC_INFO __PRETTY_FUNCTION__ -# if !defined(QT_MOC_CPP) -# define Q_PACKED __attribute__ ((__packed__)) -# endif +# define Q_PACKED __attribute__ ((__packed__)) # if __cplusplus >= 201103L || defined(__GXX_EXPERIMENTAL_CXX0X__) /* Detect C++ features using __has_feature(), see http://clang.llvm.org/docs/LanguageExtensions.html#cxx11 */ # if __has_feature(cxx_generalized_initializers)