summaryrefslogtreecommitdiffstats
path: root/src/corelib/kernel/qobject.h
diff options
context:
space:
mode:
authorMartin Smith <martin.smith@qt.io>2018-01-08 12:09:19 +0100
committerMartin Smith <martin.smith@qt.io>2018-01-09 06:39:54 +0000
commit643290e49b540a8191f869a159c0b677f5905601 (patch)
tree4d9624f14096bb27195112ad49a1f9213b4042a7 /src/corelib/kernel/qobject.h
parent986b275c514df32e51a3726cbb5b2a9f10ed0ef1 (diff)
doc: Remove Q_QDOC declarations that are no longer needed
clang-qdoc understands Q_OBJECT, so it sees the declarations that appear there. Change-Id: I669be13af59269a0e108e0988d9b4f7779274c7c Reviewed-by: Topi Reiniƶ <topi.reinio@qt.io>
Diffstat (limited to 'src/corelib/kernel/qobject.h')
-rw-r--r--src/corelib/kernel/qobject.h6
1 files changed, 1 insertions, 5 deletions
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)