Set style object on QStyleOptionFrames in QQuickStyleItem

For some controls an explicit QStyleOptionFrame is created. By setting
the styleObject the QStyle can recognize that it's a QQuickItem and
adjust the rendering. This is for example needed in the oxygen style to
get the frame around a menu.

Change-Id: I52d2a8b259477b2ff668827334d5073c6934f23c
Reviewed-by: Martin Klapetek <mklapetek@kde.org>
Reviewed-by: David Edmundson <davidedmundson@kde.org>
Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>

1 files changed, 2 insertions, 0 deletions

diff --git a/src/controls/Private/qquickstyleitem.cpp b/src/controls/Private/qquickstyleitem.cpp
index 0210e76e..c290bc28 100644
--- a/src/controls/Private/qquickstyleitem.cpp
+++ b/src/controls/Private/qquickstyleitem.cpp
@@ -917,6 +917,7 @@ QSize QQuickStyleItem::sizeFromContents(int width, int height)
             frame.state = m_styleoption->state;
             frame.lineWidth = qApp->style()->pixelMetric(QStyle::PM_DefaultFrameWidth, m_styleoption, 0);
             frame.rect = m_styleoption->rect;
+            frame.styleObject = this;
             size = qApp->style()->sizeFromContents(QStyle::CT_LineEdit, &frame, QSize(width, height));
         }
         break;
@@ -1582,6 +1583,7 @@ void QQuickStyleItem::paint(QPainter *painter)
             frame.lineWidth = fw;
             frame.midLineWidth = 0;
             frame.rect = m_styleoption->rect;
+            frame.styleObject = this;
             qApp->style()->drawPrimitive(QStyle::PE_FrameMenu, &frame, painter);
         }
     }