diff options
| author | Stephen Kelly <stephen.kelly@kdab.com> | 2012-02-22 18:17:53 +0100 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-02-22 20:51:47 +0100 |
| commit | 13c7de63a15c2b47e07516650ba4f1b70f94680e (patch) | |
| tree | 9c4e2f915a5fb179365bf8eb92305c2e87cbb5dc /src | |
| parent | 126eaa7cddbf27d73d14394dfd8b0776376a6460 (diff) | |
Don't do macro self-expansion for moc anymore.
Change-Id: Ia34cc244a160c6c4abe6dacd7a2ce29bc4fc7bfb
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/corelib/global/qglobal.h | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/src/corelib/global/qglobal.h b/src/corelib/global/qglobal.h index 58bdf06fb5..485f08bfce 100644 --- a/src/corelib/global/qglobal.h +++ b/src/corelib/global/qglobal.h @@ -310,9 +310,7 @@ QT_END_INCLUDE_NAMESPACE /* Warnings and errors when using deprecated methods */ -#if defined(Q_MOC_RUN) -# define Q_DECL_DEPRECATED Q_DECL_DEPRECATED -#elif (defined(Q_CC_GNU) && !defined(Q_CC_INTEL) && (__GNUC__ - 0 > 3 || (__GNUC__ - 0 == 3 && __GNUC_MINOR__ - 0 >= 2))) || defined(Q_CC_RVCT) +#if (defined(Q_CC_GNU) && !defined(Q_CC_INTEL) && (__GNUC__ - 0 > 3 || (__GNUC__ - 0 == 3 && __GNUC_MINOR__ - 0 >= 2))) || defined(Q_CC_RVCT) # define Q_DECL_DEPRECATED __attribute__ ((__deprecated__)) #elif defined(Q_CC_MSVC) # define Q_DECL_DEPRECATED __declspec(deprecated) @@ -327,9 +325,7 @@ QT_END_INCLUDE_NAMESPACE # define Q_DECL_VARIABLE_DEPRECATED Q_DECL_DEPRECATED #endif #ifndef Q_DECL_CONSTRUCTOR_DEPRECATED -# if defined(Q_MOC_RUN) -# define Q_DECL_CONSTRUCTOR_DEPRECATED Q_DECL_CONSTRUCTOR_DEPRECATED -# elif defined(Q_NO_DEPRECATED_CONSTRUCTORS) +# if defined(Q_NO_DEPRECATED_CONSTRUCTORS) # define Q_DECL_CONSTRUCTOR_DEPRECATED # else # define Q_DECL_CONSTRUCTOR_DEPRECATED Q_DECL_DEPRECATED |