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
69b60f0f
Commit
69b60f0f
authored
9 years ago
by
Alex Blasche
Committed by
The Qt Project
9 years ago
Browse files
Options
Download
Plain Diff
Merge "Merge remote-tracking branch 'gerrit/5.6' into dev" into refs/staging/dev
parents
ad87f487
237ce0ec
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
neard
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
v5.7.0-alpha1
No related merge requests found
Changes
18
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
18 changed files
examples/bluetooth/heartlistener/heartrate.cpp
+9
-7
examples/bluetooth/heartlistener/heartrate.cpp
qtconnectivity.pro
+2
-0
qtconnectivity.pro
src/bluetooth/android/jni_android.cpp
+1
-1
src/bluetooth/android/jni_android.cpp
src/bluetooth/osx/osxbt.pri
+5
-3
src/bluetooth/osx/osxbt.pri
src/bluetooth/osx/osxbtcentralmanager.mm
+219
-192
src/bluetooth/osx/osxbtcentralmanager.mm
src/bluetooth/osx/osxbtcentralmanager_p.h
+27
-50
src/bluetooth/osx/osxbtcentralmanager_p.h
src/bluetooth/osx/osxbtnotifier.cpp
+1
-0
src/bluetooth/osx/osxbtnotifier.cpp
src/bluetooth/osx/osxbtnotifier_p.h
+92
-0
src/bluetooth/osx/osxbtnotifier_p.h
src/bluetooth/osx/osxbtobexsession_p.h
+11
-0
src/bluetooth/osx/osxbtobexsession_p.h
src/bluetooth/qbluetoothserviceinfo.cpp
+1
-0
src/bluetooth/qbluetoothserviceinfo.cpp
src/bluetooth/qbluetoothtransferreply.cpp
+1
-0
src/bluetooth/qbluetoothtransferreply.cpp
src/bluetooth/qlowenergycontroller_android.cpp
+2
-2
src/bluetooth/qlowenergycontroller_android.cpp
src/bluetooth/qlowenergycontroller_osx.mm
+237
-105
src/bluetooth/qlowenergycontroller_osx.mm
src/bluetooth/qlowenergycontroller_osx_p.h
+32
-26
src/bluetooth/qlowenergycontroller_osx_p.h
src/bluetooth/qlowenergyservice.cpp
+4
-4
src/bluetooth/qlowenergyservice.cpp
src/imports/bluetooth/qdeclarativebluetoothdiscoverymodel.cpp
+2
-2
...imports/bluetooth/qdeclarativebluetoothdiscoverymodel.cpp
src/nfc/qqmlndefrecord.cpp
+5
-0
src/nfc/qqmlndefrecord.cpp
src/nfc/qqmlndefrecord.h
+1
-0
src/nfc/qqmlndefrecord.h
with
652 additions
and
392 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