Skip to content
GitLab
Explore
Projects
Groups
Topics
Snippets
Projects
Groups
Topics
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
BC
public
external
Qt
QtSensors
Commits
4c5873b4
Commit
4c5873b4
authored
8 years ago
by
Liang Qi
Browse files
Options
Download
Plain Diff
Merge remote-tracking branch 'origin/5.6' into 5.7
Change-Id: I77e9c7f825716af5ab4a1c04551f89e22099696e
parents
67491656
12c11ffb
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
src/plugins/sensors/android/src/androidmagnetometer.cpp
+15
-1
src/plugins/sensors/android/src/androidmagnetometer.cpp
src/sensors/qmagnetometer.cpp
+8
-2
src/sensors/qmagnetometer.cpp
sync.profile
+0
-5
sync.profile
with
23 additions
and
8 deletions
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment
Menu
Explore
Projects
Groups
Topics
Snippets