diff -r ef0373b55136 -r 758a864f9613 src/corelib/global/qglobal.h --- a/src/corelib/global/qglobal.h Fri Sep 17 08:34:18 2010 +0300 +++ b/src/corelib/global/qglobal.h Mon Oct 04 01:19:32 2010 +0300 @@ -981,9 +981,11 @@ # undef QT_DEPRECATED_VARIABLE # undef QT_DEPRECATED_CONSTRUCTOR #elif defined(QT_DEPRECATED_WARNINGS) +# ifdef QT3_SUPPORT /* enable Qt3 support warnings as well */ -# undef QT3_SUPPORT_WARNINGS -# define QT3_SUPPORT_WARNINGS +# undef QT3_SUPPORT_WARNINGS +# define QT3_SUPPORT_WARNINGS +# endif # undef QT_DEPRECATED # define QT_DEPRECATED Q_DECL_DEPRECATED # undef QT_DEPRECATED_VARIABLE