diff options
| author | Morten Johan Sørvig <morten.sorvig@digia.com> | 2014-05-13 14:28:18 +0200 |
|---|---|---|
| committer | Morten Johan Sørvig <morten.sorvig@digia.com> | 2014-07-03 09:17:43 +0200 |
| commit | 47a66d5eac0df9481cff1dc23caed4335d49b515 (patch) | |
| tree | cec297e1ff45031651ec92b5b47c22da71bdd1a6 /src/widgets/widgets/qabstractscrollarea.cpp | |
| parent | 5f7ea1a41aa9e299130f335b0023b9026de841c5 (diff) | |
Mac: Don't register for Pan Gestures.
This will enable touch events for the viewport
widget, which has undesired side effects (see task).
Fixes a regression from Qt 4.
Task-number: QTBUG-38815
Change-Id: I7b9c0d1de985d1c82f946140fecf460fcfc5e686
Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
Diffstat (limited to 'src/widgets/widgets/qabstractscrollarea.cpp')
| -rw-r--r-- | src/widgets/widgets/qabstractscrollarea.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/widgets/widgets/qabstractscrollarea.cpp b/src/widgets/widgets/qabstractscrollarea.cpp index e1e933cdd8..98e715fc62 100644 --- a/src/widgets/widgets/qabstractscrollarea.cpp +++ b/src/widgets/widgets/qabstractscrollarea.cpp @@ -309,7 +309,7 @@ void QAbstractScrollAreaPrivate::init() q->setFrameStyle(QFrame::StyledPanel | QFrame::Sunken); q->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding); layoutChildren(); -#ifndef Q_WS_MAC +#ifndef Q_OS_OSX # ifndef QT_NO_GESTURES viewport->grabGesture(Qt::PanGesture); # endif |