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
QtConnectivity
Commits
1a645c5a
Commit
1a645c5a
authored
5 years ago
by
Qt Forward Merge Bot
Committed by
Edward Welbourne
5 years ago
Browse files
Options
Download
Plain Diff
Merge "Merge remote-tracking branch 'origin/5.12' into 5.13"
parents
4d6a1030
ba19fd34
dev
5.13
5.13.1
5.13.2
5.14
5.14.0
5.14.1
5.14.2
5.15
5.15.0
5.15.1
5.15.2
6.2
6.2.0
6.2.1
6.2.2
wip/cmake
wip/win
v5.15.0-alpha1
v5.14.1
v5.14.0
v5.14.0-rc2
v5.14.0-rc1
v5.14.0-beta3
v5.14.0-beta2
v5.14.0-beta1
v5.14.0-alpha1
v5.13.2
v5.13.1
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
src/bluetooth/osx/osxbtperipheralmanager.mm
+2
-2
src/bluetooth/osx/osxbtperipheralmanager.mm
src/bluetooth/qbluetoothdevicediscoveryagent_ios.mm
+3
-3
src/bluetooth/qbluetoothdevicediscoveryagent_ios.mm
src/bluetooth/qlowenergycontroller_osx.mm
+3
-3
src/bluetooth/qlowenergycontroller_osx.mm
with
8 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