From a6e25ea93d5d645fe13e14807cde45aa913116db Mon Sep 17 00:00:00 2001
From: Don Gagne <don@thegagnes.com>
Date: Wed, 25 May 2016 23:24:21 -0700
Subject: [PATCH] Turn off touch events for Mac OS (#3404)

---
 src/QGCQuickWidget.cc | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/QGCQuickWidget.cc b/src/QGCQuickWidget.cc
index b51002f23..a8aedc194 100644
--- a/src/QGCQuickWidget.cc
+++ b/src/QGCQuickWidget.cc
@@ -39,7 +39,12 @@
 QGCQuickWidget::QGCQuickWidget(QWidget* parent) :
     QQuickWidget(parent)
 {
+#ifndef __macos__
+    // The following causes the Map control to hang after doing a pinch gesture on mac trackpads.
+    // By not turning this on for macos we lose pinch gesture, but two finger scroll still zooms the map.
+    // So it's a decent workaround. Qt bug reported: 53634
     setAttribute(Qt::WA_AcceptTouchEvents);
+#endif
     rootContext()->engine()->addImportPath("qrc:/qml");
     rootContext()->setContextProperty("joystickManager", qgcApp()->toolbox()->joystickManager());
 }
-- 
2.22.0