diff options
author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-12-08 01:00:59 +0100 |
---|---|---|
committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-12-08 01:01:00 +0100 |
commit | f8c5c1356465f503e1a8357ceff01bb956d51c9e (patch) | |
tree | 36b5bc1c2d5767b3eee0820c70b91fdfc57287b3 /src/widgets/graphicsview | |
parent | eda28621f6c1a68774719f382be53ec109123b18 (diff) | |
parent | 153726bc167406414f589f72bea76c3229cfa815 (diff) |
Merge remote-tracking branch 'origin/5.12' into dev
Change-Id: Ied1194730e75a6f30839bbf5429aa2699230288e
Diffstat (limited to 'src/widgets/graphicsview')
-rw-r--r-- | src/widgets/graphicsview/qgraphicsitem.cpp | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/src/widgets/graphicsview/qgraphicsitem.cpp b/src/widgets/graphicsview/qgraphicsitem.cpp index e81eab4c46..3a9bfab298 100644 --- a/src/widgets/graphicsview/qgraphicsitem.cpp +++ b/src/widgets/graphicsview/qgraphicsitem.cpp @@ -10569,14 +10569,11 @@ void QGraphicsTextItemPrivate::_q_update(QRectF rect) */ void QGraphicsTextItemPrivate::_q_updateBoundingRect(const QSizeF &size) { - if (!control) return; // can't happen - const QSizeF pageSize = control->document()->pageSize(); - // paged items have a constant (page) size - if (size == boundingRect.size() || pageSize.height() != -1) - return; - qq->prepareGeometryChange(); - boundingRect.setSize(size); - qq->update(); + if (size != boundingRect.size()) { + qq->prepareGeometryChange(); + boundingRect.setSize(size); + qq->update(); + } } /*! |