1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compile for Qt 6

Browse Source 
Change-Id: I3069081d1c706980a8133b06d46588c4310cb304
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
This commit is contained in:
Lars Knoll 2019-04-30 14:13:06 +02:00
parent a08c0ca949
commit 93d3248ed0
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/corelib/kernel/qobject.cpp
View File

@ -4031,6 +4031,7 @@ static void dumpRecursive(int level, const QObject *object)
} }
} }
#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
/*! /*!
\overload \overload
\obsolete \obsolete
@ -4044,6 +4045,7 @@ void QObject::dumpObjectTree()
{ {
const_cast<const QObject *>(this)->dumpObjectTree(); const_cast<const QObject *>(this)->dumpObjectTree();
} }
#endif
/*! /*!
Dumps a tree of children to the debug output. Dumps a tree of children to the debug output.
@ -4058,6 +4060,7 @@ void QObject::dumpObjectTree() const
dumpRecursive(0, this); dumpRecursive(0, this);
} }
#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
/*! /*!
\overload \overload
\obsolete \obsolete
@ -4072,6 +4075,7 @@ void QObject::dumpObjectInfo()
{ {
const_cast<const QObject *>(this)->dumpObjectInfo(); const_cast<const QObject *>(this)->dumpObjectInfo();
} }
#endif
/*! /*!
Dumps information about signal connections, etc. for this object Dumps information about signal connections, etc. for this object