From 47a66d5eac0df9481cff1dc23caed4335d49b515 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Morten=20Johan=20S=C3=B8rvig?= <morten.sorvig@digia.com>
Date: Tue, 13 May 2014 14:28:18 +0200
Subject: Mac: Don't register for Pan Gestures.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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>
---
 src/widgets/widgets/qabstractscrollarea.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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
-- 
cgit v1.2.3