From e6fad35155a25a932386ad6f8421efd74404ac7f Mon Sep 17 00:00:00 2001 From: Stephan Binner Date: Sun, 23 Jul 2017 11:31:32 +0200 Subject: Convert features.graphicsview to QT_[REQUIRE_]CONFIG Change-Id: I1083097802772624e5d414678b4612308683a56f Reviewed-by: Oswald Buddenhagen --- src/widgets/kernel/qgesturemanager.cpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'src/widgets/kernel/qgesturemanager.cpp') diff --git a/src/widgets/kernel/qgesturemanager.cpp b/src/widgets/kernel/qgesturemanager.cpp index 2e5c2c53bd..2873703cb7 100644 --- a/src/widgets/kernel/qgesturemanager.cpp +++ b/src/widgets/kernel/qgesturemanager.cpp @@ -41,13 +41,15 @@ #include "private/qstandardgestures_p.h" #include "private/qwidget_p.h" #include "private/qgesture_p.h" +#if QT_CONFIG(graphicsview) #include "private/qgraphicsitem_p.h" +#include "qgraphicsitem.h" +#endif #include "private/qevent_p.h" #include "private/qapplication_p.h" #include "private/qwidgetwindow_p.h" #include "qgesture.h" #include "qevent.h" -#include "qgraphicsitem.h" #ifdef Q_OS_OSX #include "qmacgesturerecognizer_p.h" @@ -209,7 +211,7 @@ QGesture *QGestureManager::getState(QObject *object, QGestureRecognizer *recogni return 0; } else if (QGesture *g = qobject_cast(object)) { return g; -#ifndef QT_NO_GRAPHICSVIEW +#if QT_CONFIG(graphicsview) } else { Q_ASSERT(qobject_cast(object)); QGraphicsObject *graphicsObject = static_cast(object); @@ -512,7 +514,7 @@ bool QGestureManager::filterEvent(QWidget *receiver, QEvent *event) return contexts.isEmpty() ? false : filterEventThroughContexts(contexts, event); } -#ifndef QT_NO_GRAPHICSVIEW +#if QT_CONFIG(graphicsview) bool QGestureManager::filterEvent(QGraphicsObject *receiver, QEvent *event) { QMap types; -- cgit v1.2.3