diff options
author | Liang Qi <liang.qi@qt.io> | 2017-06-15 08:57:58 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2017-06-15 09:10:12 +0200 |
commit | 9f3aefb086c5f9d6b9dd192689bdd473da07186a (patch) | |
tree | 93349812f4a46305edf5e27f7e737d952e0d9a3a /src/quick/scenegraph | |
parent | a021bd87755ccfbe49e132f942ded935c9719b00 (diff) | |
parent | d2bb2e202427ebae545a408f065c893f3d837061 (diff) |
Merge remote-tracking branch 'origin/5.9' into dev
Conflicts:
src/qml/compiler/qv4codegen.cpp
Change-Id: I3c41b9fc9ba7d41741e4dd400402ae80dd7726d9
Diffstat (limited to 'src/quick/scenegraph')
-rw-r--r-- | src/quick/scenegraph/adaptations/software/qsgsoftwarerenderablenode.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/quick/scenegraph/adaptations/software/qsgsoftwarerenderablenode.cpp b/src/quick/scenegraph/adaptations/software/qsgsoftwarerenderablenode.cpp index 0f4a0ac8f5..307615a216 100644 --- a/src/quick/scenegraph/adaptations/software/qsgsoftwarerenderablenode.cpp +++ b/src/quick/scenegraph/adaptations/software/qsgsoftwarerenderablenode.cpp @@ -232,8 +232,8 @@ void QSGSoftwareRenderableNode::update() m_boundingRectMin = QRect(); m_boundingRectMax = QRect(); } else { - m_boundingRectMin = m_boundingRectMin.intersected(m_clipRegion.rects().first()); - m_boundingRectMax = m_boundingRectMax.intersected(m_clipRegion.rects().first()); + m_boundingRectMin = m_boundingRectMin.intersected(m_clipRegion.rects().constFirst()); + m_boundingRectMax = m_boundingRectMax.intersected(m_clipRegion.rects().constFirst()); } } |