From c3160c84af3cb14c0edc5896be0ca637377e3805 Mon Sep 17 00:00:00 2001 From: Olivier Goffart Date: Wed, 23 Nov 2011 16:13:44 +0100 Subject: [PATCH] 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 --- src/corelib/global/qglobal.h | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/corelib/global/qglobal.h b/src/corelib/global/qglobal.h index 714e120..20f3ca9 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" -- 2.7.4