From cfb9d1aa1f64aeb03d75d196825cfda58fe1dcd7 Mon Sep 17 00:00:00 2001 From: Thiago Macieira Date: Fri, 8 Nov 2024 17:57:41 -0800 Subject: [PATCH] qtmetamacros.h: remove Q_DECL_HIDDEN_STATIC_METACALL It used to be different for the classic ICC. Change-Id: Ib459ecd1c0a8c701835cfffdbba1d9a46c2a684a Reviewed-by: Ivan Solovev --- src/corelib/kernel/qtmetamacros.h | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/corelib/kernel/qtmetamacros.h b/src/corelib/kernel/qtmetamacros.h index 4edfbcf8378..fe48fac3631 100644 --- a/src/corelib/kernel/qtmetamacros.h +++ b/src/corelib/kernel/qtmetamacros.h @@ -95,8 +95,6 @@ QT_BEGIN_NAMESPACE #define QT_TR_FUNCTIONS #endif -#define Q_DECL_HIDDEN_STATIC_METACALL Q_DECL_HIDDEN - #if defined(Q_CC_CLANG) # if Q_CC_CLANG >= 1100 # define Q_OBJECT_NO_OVERRIDE_WARNING QT_WARNING_DISABLE_CLANG("-Winconsistent-missing-override") QT_WARNING_DISABLE_CLANG("-Wsuggest-override") @@ -129,7 +127,7 @@ QT_BEGIN_NAMESPACE #define QT_OBJECT_GADGET_COMMON \ QT_META_OBJECT_VARS \ Q_OBJECT_NO_ATTRIBUTES_WARNING \ - Q_DECL_HIDDEN_STATIC_METACALL static void qt_static_metacall(QObject *, QMetaObject::Call, int, void **); + Q_DECL_HIDDEN static void qt_static_metacall(QObject *, QMetaObject::Call, int, void **); /* qmake ignore Q_OBJECT */ #define Q_OBJECT \