From 45f7d35f7b03e3b5fd0687e344d6a757cd4516ec Mon Sep 17 00:00:00 2001 From: Stephan Binner Date: Wed, 19 Apr 2017 08:56:27 +0200 Subject: Fix warning for -no-feature-gestures Change-Id: Iaadc4e27ee2a75a8c053de4438ef74daaa48ee64 Reviewed-by: Paul Olav Tvete --- src/widgets/graphicsview/qgraphicsscene.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/widgets/graphicsview') diff --git a/src/widgets/graphicsview/qgraphicsscene.cpp b/src/widgets/graphicsview/qgraphicsscene.cpp index e6726285d9..35f6298a8a 100644 --- a/src/widgets/graphicsview/qgraphicsscene.cpp +++ b/src/widgets/graphicsview/qgraphicsscene.cpp @@ -1225,15 +1225,15 @@ bool QGraphicsScenePrivate::filterEvent(QGraphicsItem *item, QEvent *event) */ bool QGraphicsScenePrivate::sendEvent(QGraphicsItem *item, QEvent *event) { +#if QT_CONFIG(gestures) if (QGraphicsObject *object = item->toGraphicsObject()) { -#ifndef QT_NO_GESTURES QGestureManager *gestureManager = QApplicationPrivate::instance()->gestureManager; if (gestureManager) { if (gestureManager->filterEvent(object, event)) return true; } -#endif // QT_NO_GESTURES } +#endif // QT_CONFIG(gestures) if (filterEvent(item, event)) return false; -- cgit v1.2.3 From b3066656e550077426bd2ad2e9c7e0ec4343cecd Mon Sep 17 00:00:00 2001 From: Stephan Binner Date: Wed, 19 Apr 2017 09:08:00 +0200 Subject: Fix warning for -no-feature-graphicseffect Change-Id: I0be9e4293dfcef3c144f4e998ea071336c4d56d3 Reviewed-by: Paul Olav Tvete --- src/widgets/graphicsview/qgraphicsitem.cpp | 1 + 1 file changed, 1 insertion(+) (limited to 'src/widgets/graphicsview') diff --git a/src/widgets/graphicsview/qgraphicsitem.cpp b/src/widgets/graphicsview/qgraphicsitem.cpp index f2b8b66fed..3ce9c835db 100644 --- a/src/widgets/graphicsview/qgraphicsitem.cpp +++ b/src/widgets/graphicsview/qgraphicsitem.cpp @@ -2981,6 +2981,7 @@ QRectF QGraphicsItemPrivate::effectiveBoundingRect(QGraphicsItem *topMostEffectI return brect; #else //QT_NO_GRAPHICSEFFECT + Q_UNUSED(topMostEffectItem); return q_ptr->boundingRect(); #endif //QT_NO_GRAPHICSEFFECT -- cgit v1.2.3