diff options
| author | Simon Hausmann <simon.hausmann@digia.com> | 2014-06-13 23:10:03 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@digia.com> | 2014-06-13 23:10:03 +0200 |
| commit | 9932617582470d717c97f8161a65133293c185c5 (patch) | |
| tree | 1df48d67c6e5ca4aa8b7810fc9e717083b4199e3 /src/quick/scenegraph/util | |
| parent | 7fde8a8d20da7fa00d974286fa903b3fee76d466 (diff) | |
| parent | 17ee404f2678684674b9c5c0c523602953146e37 (diff) | |
Merge remote-tracking branch 'origin/5.3' into dev
Conflicts:
src/quickwidgets/qquickwidget.cpp
Change-Id: Id4b080aea713df68608847bb82570231e37ce536
Diffstat (limited to 'src/quick/scenegraph/util')
| -rw-r--r-- | src/quick/scenegraph/util/qsgpainternode.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/quick/scenegraph/util/qsgpainternode.cpp b/src/quick/scenegraph/util/qsgpainternode.cpp index b454f666ac..8ccb9d2ffb 100644 --- a/src/quick/scenegraph/util/qsgpainternode.cpp +++ b/src/quick/scenegraph/util/qsgpainternode.cpp @@ -96,7 +96,6 @@ QSGPainterNode::QSGPainterNode(QQuickPaintedItem *item) , m_geometry(QSGGeometry::defaultAttributes_TexturedPoint2D(), 4) , m_texture(0) , m_gl_device(0) - , m_size(1, 1) , m_dirtyContents(false) , m_opaquePainting(false) , m_linear_filtering(false) @@ -116,6 +115,10 @@ QSGPainterNode::QSGPainterNode(QQuickPaintedItem *item) setMaterial(&m_materialO); setOpaqueMaterial(&m_material); setGeometry(&m_geometry); + +#ifdef QSG_RUNTIME_DESCRIPTION + qsgnode_set_description(this, QString::fromLatin1("QQuickPaintedItem(%1):%2").arg(QString::fromLatin1(item->metaObject()->className())).arg(item->objectName())); +#endif } QSGPainterNode::~QSGPainterNode() |