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
5d9d3485
Commit
5d9d3485
authored
5 years ago
by
Qt Forward Merge Bot
Browse files
Options
Download
Plain Diff
Merge remote-tracking branch 'origin/5.13' into dev
Change-Id: I13eb1c8ad1e507e0dc2e70404fcf383dc2bacdd9
parents
a628d05c
e3b24032
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
dist/changes-5.12.4
+39
-0
dist/changes-5.12.4
src/bluetooth/qbluetooth.cpp
+1
-0
src/bluetooth/qbluetooth.cpp
src/bluetooth/qbluetoothsocket_winrt.cpp
+46
-18
src/bluetooth/qbluetoothsocket_winrt.cpp
src/bluetooth/qlowenergycontroller_winrt.cpp
+29
-3
src/bluetooth/qlowenergycontroller_winrt.cpp
src/bluetooth/qlowenergycontroller_winrt_new.cpp
+25
-3
src/bluetooth/qlowenergycontroller_winrt_new.cpp
src/bluetooth/qlowenergycontroller_winrt_new_p.h
+6
-8
src/bluetooth/qlowenergycontroller_winrt_new_p.h
src/bluetooth/qlowenergycontroller_winrt_p.h
+4
-1
src/bluetooth/qlowenergycontroller_winrt_p.h
with
150 additions
and
33 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