Skip to content
GitLab
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
b91c44ee
Commit
b91c44ee
authored
5 years ago
by
Qt Forward Merge Bot
Browse files
Options
Download
Plain Diff
Merge "Merge remote-tracking branch 'origin/5.13' into dev"
parents
eb78e559
d1396084
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
dist/changes-5.13.0
+59
-0
dist/changes-5.13.0
src/bluetooth/bluetooth.pro
+1
-1
src/bluetooth/bluetooth.pro
src/bluetooth/qbluetoothlocaldevice_p.cpp
+1
-9
src/bluetooth/qbluetoothlocaldevice_p.cpp
src/bluetooth/qbluetoothlocaldevice_p.h
+31
-5
src/bluetooth/qbluetoothlocaldevice_p.h
src/bluetooth/qbluetoothlocaldevice_winrt.cpp
+202
-0
src/bluetooth/qbluetoothlocaldevice_winrt.cpp
src/bluetooth/qlowenergycontroller_winrt_new.cpp
+301
-208
src/bluetooth/qlowenergycontroller_winrt_new.cpp
src/bluetooth/qlowenergycontroller_winrt_new_p.h
+31
-3
src/bluetooth/qlowenergycontroller_winrt_new_p.h
with
626 additions
and
226 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