From 36e5c4507159bab3cf01c81cdfa5be0fd8d4e4c5 Mon Sep 17 00:00:00 2001 From: Vladimir Belyavsky Date: Fri, 2 Aug 2024 01:35:05 +0300 Subject: [PATCH] gestures: fix build when -DFEATURE_scrollarea=OFF Pick-to: 6.7 6.5 Change-Id: I1c6089875024b2cb4e3787bf7dcc2f7e8e441bd2 Reviewed-by: Volker Hilsheimer (cherry picked from commit 91bfa5531a92001f48863888e40a870aaba94602) Reviewed-by: Qt Cherry-pick Bot --- src/widgets/kernel/qstandardgestures.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/widgets/kernel/qstandardgestures.cpp b/src/widgets/kernel/qstandardgestures.cpp index 4effc1a2d15..337a6879a9b 100644 --- a/src/widgets/kernel/qstandardgestures.cpp +++ b/src/widgets/kernel/qstandardgestures.cpp @@ -6,7 +6,9 @@ #include "qgesture_p.h" #include "qevent.h" #include "qwidget.h" +#if QT_CONFIG(scrollarea) #include "qabstractscrollarea.h" +#endif #if QT_CONFIG(graphicsview) #include #endif @@ -24,7 +26,7 @@ static const qreal kSingleStepScaleMin = 0.1; QGesture *QPanGestureRecognizer::create(QObject *target) { if (target && target->isWidgetType()) { -#if (defined(Q_OS_MACOS) || defined(Q_OS_WIN)) && !defined(QT_NO_NATIVE_GESTURES) +#if (defined(Q_OS_MACOS) || defined(Q_OS_WIN)) && !defined(QT_NO_NATIVE_GESTURES) && QT_CONFIG(scrollarea) // for scroll areas on Windows and OS X we want to use native gestures instead if (!qobject_cast(target->parent())) static_cast(target)->setAttribute(Qt::WA_AcceptTouchEvents);