qtmetamacros.h: remove Q_DECL_HIDDEN_STATIC_METACALL
It used to be different for the classic ICC. Change-Id: Ib459ecd1c0a8c701835cfffdbba1d9a46c2a684a Reviewed-by: Ivan Solovev <ivan.solovev@qt.io>
This commit is contained in:
parent
cde5ce9ec6
commit
cfb9d1aa1f
@ -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 \
|
||||
|
Loading…
x
Reference in New Issue
Block a user