diff options
author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-08-29 01:00:48 +0200 |
---|---|---|
committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-08-29 01:00:49 +0200 |
commit | a31d1af59189fe865e7c1efd00627384874cb015 (patch) | |
tree | 017ee885249c7e7d04b718068299d6d72cf3bc83 /src/widgets/graphicsview/qgraphicsitem.cpp | |
parent | 9c132004b0b34f8d07a58b75c207e2fc7d695727 (diff) | |
parent | 79bf1b7e348d186934b14c417859a48bf9b3a06c (diff) |
Merge remote-tracking branch 'origin/5.14' into dev
Change-Id: I536ba1f13c5234487dc6827ad30548f5629fae2c
Diffstat (limited to 'src/widgets/graphicsview/qgraphicsitem.cpp')
-rw-r--r-- | src/widgets/graphicsview/qgraphicsitem.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/widgets/graphicsview/qgraphicsitem.cpp b/src/widgets/graphicsview/qgraphicsitem.cpp index 6273de56a6..bb00db4c01 100644 --- a/src/widgets/graphicsview/qgraphicsitem.cpp +++ b/src/widgets/graphicsview/qgraphicsitem.cpp @@ -11523,9 +11523,11 @@ QDebug operator<<(QDebug debug, QGraphicsItem::GraphicsItemChange change) case QGraphicsItem::ItemFlagsHaveChanged: str = "ItemFlagsHaveChanged"; break; +#if QT_DEPRECATED_SINCE(5, 14) case QGraphicsItem::ItemMatrixChange: str = "ItemMatrixChange"; break; +#endif case QGraphicsItem::ItemParentChange: str = "ItemParentChange"; break; |