diff options
| author | Shawn Rutledge <shawn.rutledge@qt.io> | 2017-05-06 23:16:10 +0200 |
|---|---|---|
| committer | Shawn Rutledge <shawn.rutledge@qt.io> | 2017-05-08 15:07:41 +0200 |
| commit | a3c9fb78cb33c29d49dbe83d0525c5935e77beed (patch) | |
| tree | b01c7f709c3c48326b8d11503e5da4478b3666af /src/quick/items/qquickitem_p.h | |
| parent | 93563959cd9e64087599a829fc7d6afe22d3b487 (diff) | |
| parent | cef5e9d385d0cf78e43e8ea41edf253b78f0ca13 (diff) | |
Merge remote-tracking branch 'origin/dev' into wip/pointerhandler
Change-Id: Ia06843de255547174efa556b1ab76be4b4be4287
Diffstat (limited to 'src/quick/items/qquickitem_p.h')
| -rw-r--r-- | src/quick/items/qquickitem_p.h | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/src/quick/items/qquickitem_p.h b/src/quick/items/qquickitem_p.h index 6b010fc24d..069f0ee541 100644 --- a/src/quick/items/qquickitem_p.h +++ b/src/quick/items/qquickitem_p.h @@ -95,7 +95,7 @@ public: QQuickContents(QQuickItem *item); ~QQuickContents(); - QRectF rectF() const { return QRectF(m_x, m_y, m_width, m_height); } + QRectF rectF() const { return m_contents; } inline void calcGeometry(QQuickItem *changed = 0); void complete(); @@ -113,10 +113,7 @@ private: void updateRect(); QQuickItem *m_item; - qreal m_x; - qreal m_y; - qreal m_width; - qreal m_height; + QRectF m_contents; }; void QQuickContents::calcGeometry(QQuickItem *changed) |