|
|
|
@ -39,7 +39,12 @@
@@ -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()); |
|
|
|
|
} |
|
|
|
|