1 files changed, 43 insertions, 42 deletions

diff --git a/src/corelib/kernel/qobject.cpp b/src/corelib/kernel/qobject.cpp
index 63b02d2c0c..fd1c767b4c 100644
--- a/src/corelib/kernel/qobject.cpp
+++ b/src/corelib/kernel/qobject.cpp
@@ -147,12 +147,13 @@ static inline QMutex *signalSlotLock(const QObject *o)
         uint(quintptr(o)) % sizeof(_q_ObjectMutexPool)/sizeof(QBasicMutex)]);
 }
 
-// ### Qt >= 5.6, remove qt_add/removeObject
+#if QT_VERSION < 0x60000
 extern "C" Q_CORE_EXPORT void qt_addObject(QObject *)
 {}
 
 extern "C" Q_CORE_EXPORT void qt_removeObject(QObject *)
 {}
+#endif
 
 struct QConnectionSenderSwitcher {
     QObject *receiver;
@@ -754,30 +755,6 @@ void QMetaCallEvent::placeMetaCall(QObject *object)
     \sa {Object Trees & Ownership}
 */
 
-/*!
-    \relates QObject
-
-    Returns a pointer to the object named \a name that inherits \a
-    type and with a given \a parent.
-
-    Returns 0 if there is no such child.
-
-    \snippet code/src_corelib_kernel_qobject.cpp 0
-*/
-
-void *qt_find_obj_child(QObject *parent, const char *type, const QString &name)
-{
-    QObjectList list = parent->children();
-    if (list.size() == 0) return 0;
-    for (int i = 0; i < list.size(); ++i) {
-        QObject *obj = list.at(i);
-        if (name == obj->objectName() && obj->inherits(type))
-            return obj;
-    }
-    return 0;
-}
-
-
 /*****************************************************************************
   QObject member functions
  *****************************************************************************/
@@ -835,7 +812,9 @@ QObject::QObject(QObject *parent)
             QT_RETHROW;
         }
     }
+#if QT_VERSION < 0x60000
     qt_addObject(this);
+#endif
     if (Q_UNLIKELY(qtHookData[QHooks::AddQObject]))
         reinterpret_cast<QHooks::AddQObjectCallback>(qtHookData[QHooks::AddQObject])(this);
 }
@@ -868,7 +847,9 @@ QObject::QObject(QObjectPrivate &dd, QObject *parent)
             QT_RETHROW;
         }
     }
+#if QT_VERSION < 0x60000
     qt_addObject(this);
+#endif
     if (Q_UNLIKELY(qtHookData[QHooks::AddQObject]))
         reinterpret_cast<QHooks::AddQObjectCallback>(qtHookData[QHooks::AddQObject])(this);
 }
@@ -1040,7 +1021,9 @@ QObject::~QObject()
     if (!d->children.isEmpty())
         d->deleteChildren();
 
+#if QT_VERSION < 0x60000
     qt_removeObject(this);
+#endif
     if (Q_UNLIKELY(qtHookData[QHooks::RemoveQObject]))
         reinterpret_cast<QHooks::RemoveQObjectCallback>(qtHookData[QHooks::RemoveQObject])(this);
 
@@ -3941,9 +3924,8 @@ QList<QByteArray> QObject::dynamicPropertyNames() const
   QObject debugging output routines.
  *****************************************************************************/
 
-static void dumpRecursive(int level, QObject *object)
+static void dumpRecursive(int level, const QObject *object)
 {
-#if defined(QT_DEBUG)
     if (object) {
         QByteArray buf;
         buf.fill(' ', level / 2 * 8);
@@ -3972,45 +3954,65 @@ static void dumpRecursive(int level, QObject *object)
                 dumpRecursive(level+1, children.at(i));
         }
     }
-#else
-    Q_UNUSED(level)
-        Q_UNUSED(object)
-#endif
 }
 
 /*!
-    Dumps a tree of children to the debug output.
+    \overload
+    \obsolete
 
-    This function is useful for debugging, but does nothing if the
-    library has been compiled in release mode (i.e. without debugging
-    information).
+    Dumps a tree of children to the debug output.
 
     \sa dumpObjectInfo()
 */
 
 void QObject::dumpObjectTree()
 {
+    const_cast<const QObject *>(this)->dumpObjectTree();
+}
+
+/*!
+    Dumps a tree of children to the debug output.
+
+    \note before Qt 5.9, this function was not const.
+
+    \sa dumpObjectInfo()
+*/
+
+void QObject::dumpObjectTree() const
+{
     dumpRecursive(0, this);
 }
 
 /*!
+    \overload
+    \obsolete
+
     Dumps information about signal connections, etc. for this object
     to the debug output.
 
-    This function is useful for debugging, but does nothing if the
-    library has been compiled in release mode (i.e. without debugging
-    information).
-
     \sa dumpObjectTree()
 */
 
 void QObject::dumpObjectInfo()
 {
-#if defined(QT_DEBUG)
+    const_cast<const QObject *>(this)->dumpObjectInfo();
+}
+
+/*!
+    Dumps information about signal connections, etc. for this object
+    to the debug output.
+
+    \note before Qt 5.9, this function was not const.
+
+    \sa dumpObjectTree()
+*/
+
+void QObject::dumpObjectInfo() const
+{
     qDebug("OBJECT %s::%s", metaObject()->className(),
            objectName().isEmpty() ? "unnamed" : objectName().toLocal8Bit().data());
 
-    Q_D(QObject);
+    Q_D(const QObject);
     QMutexLocker locker(signalSlotLock(this));
 
     // first, look for connections where this object is the sender
@@ -4066,7 +4068,6 @@ void QObject::dumpObjectInfo()
     } else {
         qDebug("        <None>");
     }
-#endif
 }
 
 #ifndef QT_NO_USERDATA