diff options
Diffstat (limited to 'src/corelib')
-rw-r--r-- | src/corelib/kernel/qobject.cpp | 25 | ||||
-rw-r--r-- | src/corelib/kernel/qobject_p.h | 4 |
2 files changed, 12 insertions, 17 deletions
diff --git a/src/corelib/kernel/qobject.cpp b/src/corelib/kernel/qobject.cpp index 116b080b21..70f98e8324 100644 --- a/src/corelib/kernel/qobject.cpp +++ b/src/corelib/kernel/qobject.cpp @@ -4202,27 +4202,18 @@ QList<QByteArray> QObject::dynamicPropertyNames() const QObject debugging output routines. *****************************************************************************/ +std::string QObjectPrivate::flagsForDumping() const +{ + return {}; +} + static void dumpRecursive(int level, const QObject *object) { if (object) { const int indent = level * 4; - const QString name = object->objectName(); - QString flags; -#if 0 - if (qApp->focusWidget() == object) - flags += 'F'; - if (object->isWidgetType()) { - QWidget * w = (QWidget *)object; - if (w->isVisible()) { - QString t("<%1,%2,%3,%4>"); - flags += t.arg(w->x()).arg(w->y()).arg(w->width()).arg(w->height()); - } else { - flags += 'I'; - } - } -#endif - qDebug("%*s%s::%ls %ls", indent, "", object->metaObject()->className(), - qUtf16Printable(name), qUtf16Printable(flags)); + qDebug("%*s%s::%ls %s", indent, "", object->metaObject()->className(), + qUtf16Printable(object->objectName()), + QObjectPrivate::get(object)->flagsForDumping().c_str()); for (auto child : object->children()) dumpRecursive(level + 1, child); } diff --git a/src/corelib/kernel/qobject_p.h b/src/corelib/kernel/qobject_p.h index 149c6a03a6..d98c7065f0 100644 --- a/src/corelib/kernel/qobject_p.h +++ b/src/corelib/kernel/qobject_p.h @@ -63,6 +63,8 @@ #include "QtCore/qproperty.h" #include "QtCore/private/qproperty_p.h" +#include <string> + QT_BEGIN_NAMESPACE class QVariant; @@ -412,6 +414,8 @@ public: connections.storeRelaxed(cd); } + virtual std::string flagsForDumping() const; + public: mutable ExtraData *extraData; // extra data set by the user // This atomic requires acquire/release semantics in a few places, |