diff options
| author | Lars Schmertmann <Lars.Schmertmann@governikus.de> | 2020-07-02 15:19:46 +0200 |
|---|---|---|
| committer | Lars Schmertmann <Lars.Schmertmann@governikus.de> | 2020-07-02 20:51:52 +0200 |
| commit | d4c04acc65657d29df5b790281a8d1ba896dd868 (patch) | |
| tree | 206769edf5c68f93957c4888569730994f2e7e92 | |
| parent | 1b7a0bcbb5e09af89298303c7a8436396b11805b (diff) | |
Remove deprecated empty macro
Change-Id: Ib2a646ee22a7f97dae584e6f068f17378fe2b494
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
| -rw-r--r-- | src/corelib/kernel/qtmetamacros.h | 3 | ||||
| -rw-r--r-- | tests/auto/corelib/kernel/qmetaobjectbuilder/tst_qmetaobjectbuilder.cpp | 1 |
2 files changed, 0 insertions, 4 deletions
diff --git a/src/corelib/kernel/qtmetamacros.h b/src/corelib/kernel/qtmetamacros.h index 68f74cafc3..ab2e10884f 100644 --- a/src/corelib/kernel/qtmetamacros.h +++ b/src/corelib/kernel/qtmetamacros.h @@ -166,9 +166,6 @@ QT_BEGIN_NAMESPACE #define QT_TR_FUNCTIONS #endif -// ### Qt6: remove -#define Q_OBJECT_CHECK /* empty, unused since Qt 5.2 */ - #if defined(Q_CC_INTEL) // Cannot redefine the visibility of a method in an exported class # define Q_DECL_HIDDEN_STATIC_METACALL diff --git a/tests/auto/corelib/kernel/qmetaobjectbuilder/tst_qmetaobjectbuilder.cpp b/tests/auto/corelib/kernel/qmetaobjectbuilder/tst_qmetaobjectbuilder.cpp index 60b2f41ed3..893479843f 100644 --- a/tests/auto/corelib/kernel/qmetaobjectbuilder/tst_qmetaobjectbuilder.cpp +++ b/tests/auto/corelib/kernel/qmetaobjectbuilder/tst_qmetaobjectbuilder.cpp @@ -1341,7 +1341,6 @@ class TestObject : public QObject { // Manually expanded from Q_OBJECT macro public: - Q_OBJECT_CHECK static QMetaObject staticMetaObject; virtual const QMetaObject *metaObject() const; virtual void *qt_metacast(const char *); |