diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-11-01 01:01:01 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-11-01 01:01:02 +0100 |
| commit | 4b0af2cdbf61572b22ea6b8aa17fc9f52c71ac4b (patch) | |
| tree | 60fb25a6772f5ac2d26af005b9888ff09c08a6c1 /src/widgets/graphicsview | |
| parent | cff492fed1d98f45c4c1f4011f1451120c0d1c23 (diff) | |
| parent | 36e277e91732d6d75fb6d9cb691fe9c0f83f6178 (diff) | |
Merge remote-tracking branch 'origin/5.15' into dev
Change-Id: I68a6ed3184e62fa89c47c564bb01002c0918d0fd
Diffstat (limited to 'src/widgets/graphicsview')
| -rw-r--r-- | src/widgets/graphicsview/qgraphicsitem.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/widgets/graphicsview/qgraphicsitem.cpp b/src/widgets/graphicsview/qgraphicsitem.cpp index 88baf8015a..b58a8c0b3c 100644 --- a/src/widgets/graphicsview/qgraphicsitem.cpp +++ b/src/widgets/graphicsview/qgraphicsitem.cpp @@ -4545,6 +4545,8 @@ QTransform QGraphicsItem::itemTransform(const QGraphicsItem *other, bool *ok) co } #if QT_DEPRECATED_SINCE(5, 13) +QT_WARNING_PUSH +QT_WARNING_DISABLE_DEPRECATED /*! \obsolete @@ -4583,6 +4585,7 @@ void QGraphicsItem::setMatrix(const QMatrix &matrix, bool combine) // Send post-notification. itemChange(ItemTransformHasChanged, QVariant::fromValue<QTransform>(newTransform)); } +QT_WARNING_POP #endif /*! @@ -11519,9 +11522,12 @@ QDebug operator<<(QDebug debug, QGraphicsItem::GraphicsItemChange change) str = "ItemFlagsHaveChanged"; break; #if QT_DEPRECATED_SINCE(5, 14) +QT_WARNING_PUSH +QT_WARNING_DISABLE_DEPRECATED case QGraphicsItem::ItemMatrixChange: str = "ItemMatrixChange"; break; +QT_WARNING_POP #endif case QGraphicsItem::ItemParentChange: str = "ItemParentChange"; |