diff --git a/src/corelib/global/qcompilerdetection.h b/src/corelib/global/qcompilerdetection.h index 69cde64587d..137756aefc7 100644 --- a/src/corelib/global/qcompilerdetection.h +++ b/src/corelib/global/qcompilerdetection.h @@ -201,11 +201,9 @@ # define Q_DECL_PURE_FUNCTION __attribute__((pure)) # define Q_DECL_CONST_FUNCTION __attribute__((const)) # define Q_DECL_COLD_FUNCTION __attribute__((cold)) -# 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 Q_CC_GNU >= 403 && !defined(Q_CC_CLANG) # define Q_ALLOC_SIZE(x) __attribute__((alloc_size(x))) diff --git a/src/corelib/thread/qthreadstorage.h b/src/corelib/thread/qthreadstorage.h index 909203dc64b..35ba0700796 100644 --- a/src/corelib/thread/qthreadstorage.h +++ b/src/corelib/thread/qthreadstorage.h @@ -27,9 +27,6 @@ public: int id; }; -#if !defined(QT_MOC_CPP) -// MOC_SKIP_BEGIN - // pointer specialization template inline @@ -86,10 +83,6 @@ inline void qThreadStorage_deleteData(void *d, T *) { delete static_cast(d); } - -// MOC_SKIP_END -#endif - template class QThreadStorage {