diff options
| author | Liang Qi <liang.qi@qt.io> | 2019-04-24 09:52:30 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2019-04-24 09:52:30 +0200 |
| commit | dc373186841802f2dd17fcd243efdeca7d5433e9 (patch) | |
| tree | 4fff0a3366b63db97ca5a8b04a220bb0b8c56450 /src/widgets/graphicsview/qgraphicsscene.cpp | |
| parent | 7d646508c8219408f90103ed13613db8d01a4065 (diff) | |
| parent | cb10ec56f733c34d23c9e5511b19c1e508d0f13f (diff) | |
Merge remote-tracking branch 'origin/5.13' into dev
Conflicts:
src/gui/util/qshaderformat.cpp
src/gui/util/qshaderformat_p.h
src/widgets/graphicsview/qgraphicsitem_p.h
Change-Id: Idafd88eb9a0a15b4af29f6143d009c1ec8ceecca
Diffstat (limited to 'src/widgets/graphicsview/qgraphicsscene.cpp')
| -rw-r--r-- | src/widgets/graphicsview/qgraphicsscene.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/widgets/graphicsview/qgraphicsscene.cpp b/src/widgets/graphicsview/qgraphicsscene.cpp index 19d9f25307..3897823e98 100644 --- a/src/widgets/graphicsview/qgraphicsscene.cpp +++ b/src/widgets/graphicsview/qgraphicsscene.cpp @@ -4852,7 +4852,7 @@ void QGraphicsScenePrivate::drawSubtreeRecursive(QGraphicsItem *item, QPainter * && painter->worldTransform().type() <= QTransform::TxTranslate) { QRectF sourceRect = sourced->boundingRect(Qt::DeviceCoordinates); - QRect effectRect = sourced->paddedEffectRect(Qt::DeviceCoordinates, sourced->currentCachedMode(), sourceRect); + QRect effectRect = sourced->paddedEffectRect(Qt::DeviceCoordinates, sourced->currentCachedMode(), sourceRect).toAlignedRect(); sourced->setCachedOffset(effectRect.topLeft()); } else { |