From e2ff48441b2f9f4930a95ecaae14a5d8562f89e1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kai=20K=C3=B6hne?= Date: Tue, 21 Jun 2022 15:39:40 +0200 Subject: [PATCH] MSVC: Remove dead Q_DECL_DEPRECATED* definitions Later on we redefine them to [[deprecated]], [[deprecated("")]], if the attribute is available. Since both MSVC 2019 and 2022 support the attribute, the __declspec() definition was never used. https://docs.microsoft.com/en-us/cpp/cpp/attributes Fixes: QTBUG-93748 Change-Id: I3e12f2ace414e316a811f2ceb44e6f312803439a Reviewed-by: Thiago Macieira (cherry picked from commit f921b42f34f254ca7066691f3cf4a1c7270f0161) Reviewed-by: Qt Cherry-pick Bot --- src/corelib/global/qcompilerdetection.h | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/corelib/global/qcompilerdetection.h b/src/corelib/global/qcompilerdetection.h index 30d2a294dc8..dc366421a31 100644 --- a/src/corelib/global/qcompilerdetection.h +++ b/src/corelib/global/qcompilerdetection.h @@ -61,10 +61,6 @@ # define Q_ASSUME_IMPL(expr) __assume(expr) # define Q_UNREACHABLE_IMPL() __assume(0) # define Q_NORETURN __declspec(noreturn) -# define Q_DECL_DEPRECATED __declspec(deprecated) -# ifndef Q_CC_CLANG -# define Q_DECL_DEPRECATED_X(text) __declspec(deprecated(text)) -# endif # define Q_DECL_EXPORT __declspec(dllexport) # define Q_DECL_IMPORT __declspec(dllimport) # define QT_MAKE_UNCHECKED_ARRAY_ITERATOR(x) stdext::make_unchecked_array_iterator(x) // Since _MSC_VER >= 1800