From 643290e49b540a8191f869a159c0b677f5905601 Mon Sep 17 00:00:00 2001 From: Martin Smith Date: Mon, 8 Jan 2018 12:09:19 +0100 Subject: doc: Remove Q_QDOC declarations that are no longer needed MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit clang-qdoc understands Q_OBJECT, so it sees the declarations that appear there. Change-Id: I669be13af59269a0e108e0988d9b4f7779274c7c Reviewed-by: Topi Reiniö --- src/corelib/kernel/qobject.h | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'src/corelib/kernel') diff --git a/src/corelib/kernel/qobject.h b/src/corelib/kernel/qobject.h index da9c422739..867685a7dc 100644 --- a/src/corelib/kernel/qobject.h +++ b/src/corelib/kernel/qobject.h @@ -126,11 +126,7 @@ public: virtual bool event(QEvent *event); virtual bool eventFilter(QObject *watched, QEvent *event); -#ifdef Q_CLANG_QDOC - virtual const QMetaObject *metaObject() const; - static const QMetaObject staticMetaObject; -#endif -#if defined(QT_NO_TRANSLATION) || defined(Q_CLANG_QDOC) +#if defined(QT_NO_TRANSLATION) static QString tr(const char *sourceText, const char * = nullptr, int = -1) { return QString::fromUtf8(sourceText); } #if QT_DEPRECATED_SINCE(5, 0) -- cgit v1.2.3