diff options
| author | Lars Knoll <lars.knoll@qt.io> | 2019-04-30 14:13:06 +0200 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@qt.io> | 2019-05-02 11:52:18 +0000 |
| commit | 93d3248ed0c81cbe162781a3fac1243c774a7574 (patch) | |
| tree | f07a3cede6de430ae566266cd2342d55b15c08d0 /src/corelib/kernel | |
| parent | a08c0ca94974142af77ec30eee715a5eb9a2faf5 (diff) | |
Compile for Qt 6
Change-Id: I3069081d1c706980a8133b06d46588c4310cb304
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'src/corelib/kernel')
| -rw-r--r-- | src/corelib/kernel/qobject.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/corelib/kernel/qobject.cpp b/src/corelib/kernel/qobject.cpp index 73b655cb36..eaf35adb90 100644 --- a/src/corelib/kernel/qobject.cpp +++ b/src/corelib/kernel/qobject.cpp @@ -4031,6 +4031,7 @@ static void dumpRecursive(int level, const QObject *object) } } +#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) /*! \overload \obsolete @@ -4044,6 +4045,7 @@ void QObject::dumpObjectTree() { const_cast<const QObject *>(this)->dumpObjectTree(); } +#endif /*! Dumps a tree of children to the debug output. @@ -4058,6 +4060,7 @@ void QObject::dumpObjectTree() const dumpRecursive(0, this); } +#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) /*! \overload \obsolete @@ -4072,6 +4075,7 @@ void QObject::dumpObjectInfo() { const_cast<const QObject *>(this)->dumpObjectInfo(); } +#endif /*! Dumps information about signal connections, etc. for this object |