diff options
| author | Christian Ehrlicher <ch.ehrlicher@gmx.de> | 2019-10-27 11:49:02 +0100 |
|---|---|---|
| committer | Christian Ehrlicher <ch.ehrlicher@gmx.de> | 2019-10-28 13:09:40 +0100 |
| commit | 5b22dc71a3eaa70fc2ae14ba950c8d897ef3cd6a (patch) | |
| tree | 74d5a6a391a4745a12b3b51d36ae473b2baca59a /src/widgets | |
| parent | 9cb823cd0fe42ea6dabfe5692fec491768950c31 (diff) | |
QGraphicsItem: disable deprecated warnings during compilation
The previous commits which deprecated the function forgot to add
QT_WARNING_PUSH/QT_WARNING_POP around the affected code.
Change-Id: I042a2bcd40afe2e5fe517954be26a02fd048b563
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Diffstat (limited to 'src/widgets')
| -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 bb00db4c01..7c0f836156 100644 --- a/src/widgets/graphicsview/qgraphicsitem.cpp +++ b/src/widgets/graphicsview/qgraphicsitem.cpp @@ -4550,6 +4550,8 @@ QTransform QGraphicsItem::itemTransform(const QGraphicsItem *other, bool *ok) co } #if QT_DEPRECATED_SINCE(5, 13) +QT_WARNING_PUSH +QT_WARNING_DISABLE_DEPRECATED /*! \obsolete @@ -4588,6 +4590,7 @@ void QGraphicsItem::setMatrix(const QMatrix &matrix, bool combine) // Send post-notification. itemChange(ItemTransformHasChanged, QVariant::fromValue<QTransform>(newTransform)); } +QT_WARNING_POP #endif /*! @@ -11524,9 +11527,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"; |