Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Q
qgroundcontrol
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Valentin Platzgummer
qgroundcontrol
Commits
a6e25ea9
Commit
a6e25ea9
authored
May 25, 2016
by
Don Gagne
Committed by
Lorenz Meier
May 26, 2016
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Turn off touch events for Mac OS (#3404)
parent
4656294b
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
0 deletions
+5
-0
QGCQuickWidget.cc
src/QGCQuickWidget.cc
+5
-0
No files found.
src/QGCQuickWidget.cc
View file @
a6e25ea9
...
@@ -39,7 +39,12 @@
...
@@ -39,7 +39,12 @@
QGCQuickWidget
::
QGCQuickWidget
(
QWidget
*
parent
)
:
QGCQuickWidget
::
QGCQuickWidget
(
QWidget
*
parent
)
:
QQuickWidget
(
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
);
setAttribute
(
Qt
::
WA_AcceptTouchEvents
);
#endif
rootContext
()
->
engine
()
->
addImportPath
(
"qrc:/qml"
);
rootContext
()
->
engine
()
->
addImportPath
(
"qrc:/qml"
);
rootContext
()
->
setContextProperty
(
"joystickManager"
,
qgcApp
()
->
toolbox
()
->
joystickManager
());
rootContext
()
->
setContextProperty
(
"joystickManager"
,
qgcApp
()
->
toolbox
()
->
joystickManager
());
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment