diff options
| author | J-P Nurmi <jpnurmi@qt.io> | 2018-03-23 08:06:52 +0100 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@qt.io> | 2018-04-04 08:59:26 +0000 |
| commit | 5e6b1e2950aa96b53c2fe77185f8d3bf420d27e9 (patch) | |
| tree | f54e5f090f6696f9748a146a371a9a5d05ba3668 /src/quicktemplates2/qquickcontentitem.cpp | |
| parent | d055ee18b6012033de5138d429ddda5f421ddbc7 (diff) | |
QQuickContentItem: make use of QQmlMetaType::prettyTypeName()
a064824 added QQuickContentItem to provide more useful debug output.
This improves the debug output further by providing the correct QML
type name for types inherited from Pane and Popup, such as Frame and
Dialog.
With:
ApplicationWindow {
Pane { Component.onCompleted: console.log(contentItem) }
Frame { Component.onCompleted: console.log(contentItem) }
Popup { Component.onCompleted: console.log(contentItem) }
Dialog { Component.onCompleted: console.log(contentItem) }
Component.onCompleted: console.log(contentItem)
}
Before:
qml: QQuickContentItem(0x7fa3397cfa70, "ApplicationWindow")
qml: QQuickContentItem(0x7fa3397d6f10, "Popup")
qml: QQuickContentItem(0x7fa3397d3f00, "Popup")
qml: QQuickContentItem(0x7fa339534990, "Pane")
qml: QQuickContentItem(0x7fa339534e40, "Pane")
After:
qml: QQuickContentItem(0x7fbebfce3210, "ApplicationWindow")
qml: QQuickContentItem(0x7fbebfcea790, "Dialog")
qml: QQuickContentItem(0x7fbebfce7730, "Popup")
qml: QQuickContentItem(0x7fbebfcf61d0, "Frame")
qml: QQuickContentItem(0x7fbebfcf4d20, "Pane")
Change-Id: Ie8ab2b0c576f3bda7edf9840f7d030d3eef383f3
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
Diffstat (limited to 'src/quicktemplates2/qquickcontentitem.cpp')
| -rw-r--r-- | src/quicktemplates2/qquickcontentitem.cpp | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/src/quicktemplates2/qquickcontentitem.cpp b/src/quicktemplates2/qquickcontentitem.cpp index 286e7209..95665f70 100644 --- a/src/quicktemplates2/qquickcontentitem.cpp +++ b/src/quicktemplates2/qquickcontentitem.cpp @@ -36,6 +36,8 @@ #include "qquickcontentitem_p.h" +#include <QtQml/private/qqmlmetatype_p.h> + QT_BEGIN_NAMESPACE /*! @@ -44,10 +46,16 @@ QT_BEGIN_NAMESPACE Helper class that aids debugging by producing more useful debugging output. */ -QQuickContentItem::QQuickContentItem(const QString &objectName, QQuickItem *parent) +QQuickContentItem::QQuickContentItem(QQuickItem *parent) + : QQuickItem(parent) +{ + setObjectName(QQmlMetaType::prettyTypeName(parent)); +} + +QQuickContentItem::QQuickContentItem(const QObject *scope, QQuickItem *parent) : QQuickItem(parent) { - setObjectName(objectName); + setObjectName(QQmlMetaType::prettyTypeName(scope)); } QT_END_NAMESPACE |