1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Don't do macro self-expansion for moc anymore.

Browse Source 
Change-Id: Ia34cc244a160c6c4abe6dacd7a2ce29bc4fc7bfb
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
This commit is contained in:
Stephen Kelly 2012-02-22 18:17:53 +01:00 committed by Qt by Nokia
parent 126eaa7cdd
commit 13c7de63a1
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/corelib/global/qglobal.h
View File

@ -310,9 +310,7 @@ QT_END_INCLUDE_NAMESPACE
/* /*
Warnings and errors when using deprecated methods Warnings and errors when using deprecated methods
*/ */
#if defined(Q_MOC_RUN) #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 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)
# define Q_DECL_DEPRECATED __attribute__ ((__deprecated__)) # define Q_DECL_DEPRECATED __attribute__ ((__deprecated__))
#elif defined(Q_CC_MSVC) #elif defined(Q_CC_MSVC)
# define Q_DECL_DEPRECATED __declspec(deprecated) # define Q_DECL_DEPRECATED __declspec(deprecated)
@ -327,9 +325,7 @@ QT_END_INCLUDE_NAMESPACE
# define Q_DECL_VARIABLE_DEPRECATED Q_DECL_DEPRECATED # define Q_DECL_VARIABLE_DEPRECATED Q_DECL_DEPRECATED
#endif #endif
#ifndef Q_DECL_CONSTRUCTOR_DEPRECATED #ifndef Q_DECL_CONSTRUCTOR_DEPRECATED
# if defined(Q_MOC_RUN) # if defined(Q_NO_DEPRECATED_CONSTRUCTORS)
# define Q_DECL_CONSTRUCTOR_DEPRECATED Q_DECL_CONSTRUCTOR_DEPRECATED
# elif defined(Q_NO_DEPRECATED_CONSTRUCTORS)
# define Q_DECL_CONSTRUCTOR_DEPRECATED # define Q_DECL_CONSTRUCTOR_DEPRECATED
# else # else
# define Q_DECL_CONSTRUCTOR_DEPRECATED Q_DECL_DEPRECATED # define Q_DECL_CONSTRUCTOR_DEPRECATED Q_DECL_DEPRECATED