diff options
| author | Olivier Goffart <ogoffart@woboq.com> | 2011-11-23 16:13:44 +0100 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-11-23 16:33:33 +0100 |
| commit | c3160c84af3cb14c0edc5896be0ca637377e3805 (patch) | |
| tree | 308441b4af0b11e6b013e3731f992a56388c786f | |
| parent | 013a3ee5dcecd18da9ed05ac2b064629f8eaed61 (diff) | |
Fix QT_DEPRECATED_SINCE on windows.
Apparently, MSVC preprocessor do not understand correctly the defined()
in that macro (used in another #if)
Change-Id: I9bd102eb4e0cbaa65bea48db786a45d861491ad7
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
| -rw-r--r-- | src/corelib/global/qglobal.h | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/src/corelib/global/qglobal.h b/src/corelib/global/qglobal.h index 714e120db6..20f3ca9351 100644 --- a/src/corelib/global/qglobal.h +++ b/src/corelib/global/qglobal.h @@ -69,8 +69,13 @@ #if QT_DEPRECATED_SINCE(5,1) QT_DEPRECATED void deprecatedFunction(); //function deprecated since Qt 5.1 #endif - */ -#define QT_DEPRECATED_SINCE(major, minor) (defined(QT_DEPRECATED) && QT_VERSION_CHECK(major, minor, 0) > QT_DISABLE_DEPRECATED_BEFORE) + +*/ +#ifdef QT_DEPRECATED +#define QT_DEPRECATED_SINCE(major, minor) (QT_VERSION_CHECK(major, minor, 0) > QT_DISABLE_DEPRECATED_BEFORE) +#else +#define QT_DEPRECATED_SINCE(major, minor) 0 +#endif #define QT_PACKAGEDATE_STR "YYYY-MM-DD" |