diff options
| author | Olivier Goffart <olivier.goffart@nokia.com> | 2010-08-03 10:07:10 (GMT) |
|---|---|---|
| committer | Olivier Goffart <olivier.goffart@nokia.com> | 2010-08-03 10:32:08 (GMT) |
| commit | 0c6f61ccdf24259d9dc64ae0d0bcd004a957cd46 (patch) | |
| tree | 6ca9513f1b17a68e9d126e152bd2f485033c8f83 | |
| parent | 6b2a5c6f18cb766801a50db583e14a8e559e9bfb (diff) | |
| download | Qt-0c6f61ccdf24259d9dc64ae0d0bcd004a957cd46.zip Qt-0c6f61ccdf24259d9dc64ae0d0bcd004a957cd46.tar.gz Qt-0c6f61ccdf24259d9dc64ae0d0bcd004a957cd46.tar.bz2 | |
Fixed: QT_DEPRECATED_WARNINGS defines QT3_SUPPORT
Task-number: QTBUG-1043
Reviewed-by: Thorbjorn
| -rw-r--r-- | src/corelib/global/qglobal.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/corelib/global/qglobal.h b/src/corelib/global/qglobal.h index 7b915cd..8f27b03 100644 --- a/src/corelib/global/qglobal.h +++ b/src/corelib/global/qglobal.h @@ -981,9 +981,11 @@ redefine to built-in booleans to make autotests work properly */ # 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 |