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
f8759f68
Commit
f8759f68
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: I77d7b5877ce36057c3882a0b397ff27d5c35ad53
parents
ffbcf72c
1f83f647
dev
5.10
5.11
5.12
5.12.1
5.12.10
5.12.11
5.12.12
5.12.2
5.12.3
5.12.4
5.12.5
5.12.6
5.12.7
5.12.8
5.12.9
5.13
5.13.0
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
5.7
5.8
5.9
5.9.8
6.2
6.2.0
6.2.1
6.2.2
btle
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
v5.13.0
v5.13.0-rc3
v5.13.0-rc2
v5.13.0-rc1
v5.13.0-beta4
v5.13.0-beta3
v5.13.0-beta2
v5.13.0-beta1
v5.13.0-alpha1
v5.12.7
v5.12.6
v5.12.5
v5.12.4
v5.12.3
v5.12.2
v5.12.1
v5.12.0
v5.12.0-rc2
v5.12.0-rc1
v5.12.0-beta4
v5.12.0-beta3
v5.12.0-beta2
v5.12.0-beta1
v5.12.0-alpha1
v5.11.3
v5.11.2
v5.11.1
v5.11.0
v5.11.0-rc2
v5.11.0-rc1
v5.11.0-beta4
v5.11.0-beta3
v5.11.0-beta2
v5.11.0-beta1
v5.11.0-alpha1
v5.10.1
v5.10.0
v5.10.0-rc3
v5.10.0-rc2
v5.10.0-rc1
v5.10.0-beta4
v5.10.0-beta3
v5.10.0-beta2
v5.10.0-beta1
v5.10.0-alpha1
v5.9.9
v5.9.8
v5.9.7
v5.9.6
v5.9.5
v5.9.4
v5.9.3
v5.9.2
v5.9.1
v5.9.0
v5.9.0-rc2
v5.9.0-rc1
v5.9.0-beta4
v5.9.0-beta3
v5.9.0-beta2
v5.9.0-beta1
v5.9.0-alpha1
v5.8.0
v5.8.0-rc1
v5.8.0-beta1
v5.8.0-alpha1
v5.7.1
v5.7.0
v5.7.0-rc1
v5.7.0-beta1
No related merge requests found
Changes
17
Hide whitespace changes
Inline
Side-by-side
Showing
17 changed files
examples/bluetooth/btfiletransfer/doc/images/btfiletransfer-example.png
+0
-0
...ooth/btfiletransfer/doc/images/btfiletransfer-example.png
examples/bluetooth/btscanner/doc/images/btscanner-example.png
+0
-0
...ples/bluetooth/btscanner/doc/images/btscanner-example.png
examples/bluetooth/chat/images/clear.png
+0
-0
examples/bluetooth/chat/images/clear.png
examples/bluetooth/chat/images/lineedit-bg.png
+0
-0
examples/bluetooth/chat/images/lineedit-bg.png
examples/bluetooth/heartlistener/doc/images/heartratefound.png
+0
-0
...les/bluetooth/heartlistener/doc/images/heartratefound.png
examples/bluetooth/heartlistener/doc/images/heartrateresults.png
+0
-0
...s/bluetooth/heartlistener/doc/images/heartrateresults.png
examples/bluetooth/picturetransfer/doc/images/opp-example-1.png
+0
-0
...es/bluetooth/picturetransfer/doc/images/opp-example-1.png
examples/bluetooth/picturetransfer/doc/images/opp-example-2.png
+0
-0
...es/bluetooth/picturetransfer/doc/images/opp-example-2.png
examples/bluetooth/picturetransfer/doc/images/opp-example-3.png
+0
-0
...es/bluetooth/picturetransfer/doc/images/opp-example-3.png
examples/bluetooth/scanner/doc/images/devicescan.png
+0
-0
examples/bluetooth/scanner/doc/images/devicescan.png
examples/bluetooth/scanner/doc/images/servicescan.png
+0
-0
examples/bluetooth/scanner/doc/images/servicescan.png
examples/nfc/annotatedurl/doc/images/annotatedurl.png
+0
-0
examples/nfc/annotatedurl/doc/images/annotatedurl.png
examples/nfc/corkboard/note-yellow.png
+0
-0
examples/nfc/corkboard/note-yellow.png
examples/nfc/ndefeditor/doc/images/ndefeditor.png
+0
-0
examples/nfc/ndefeditor/doc/images/ndefeditor.png
src/bluetooth/doc/images/peripheral-structure.png
+0
-0
src/bluetooth/doc/images/peripheral-structure.png
src/bluetooth/osx/osxbtcentralmanager.mm
+1
-1
src/bluetooth/osx/osxbtcentralmanager.mm
src/bluetooth/qbluetoothhostinfo.cpp
+2
-2
src/bluetooth/qbluetoothhostinfo.cpp
with
3 additions
and
3 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