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
1adf8bf5
Commit
1adf8bf5
authored
9 years ago
by
Alex Blasche
Browse files
Options
Download
Plain Diff
Merge remote-tracking branch 'gerrit/dev' into neard
Change-Id: If9cf6718cbd619dd7ce38db2da274fe9d0a41fb7
parents
4b5d9010
b277b952
Changes
289
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
20 changed files
LICENSE.GPL2
+339
-0
LICENSE.GPL2
LICENSE.GPL3
+674
-0
LICENSE.GPL3
LICENSE.GPL3-EXCEPT
+704
-0
LICENSE.GPL3-EXCEPT
LICENSE.LGPL3
+165
-0
LICENSE.LGPL3
config.tests/bluez/main.cpp
+12
-17
config.tests/bluez/main.cpp
config.tests/bluez_le/main.cpp
+12
-17
config.tests/bluez_le/main.cpp
src/android/bluetooth/src/org/qtproject/qt5/android/bluetooth/QtBluetoothBroadcastReceiver.java
+21
-15
...t/qt5/android/bluetooth/QtBluetoothBroadcastReceiver.java
src/android/bluetooth/src/org/qtproject/qt5/android/bluetooth/QtBluetoothInputStreamThread.java
+20
-14
...t/qt5/android/bluetooth/QtBluetoothInputStreamThread.java
src/android/bluetooth/src/org/qtproject/qt5/android/bluetooth/QtBluetoothLE.java
+20
-14
...rc/org/qtproject/qt5/android/bluetooth/QtBluetoothLE.java
src/android/bluetooth/src/org/qtproject/qt5/android/bluetooth/QtBluetoothSocketServer.java
+20
-14
...roject/qt5/android/bluetooth/QtBluetoothSocketServer.java
src/android/nfc/src/org/qtproject/qt5/android/nfc/QtNfc.java
+20
-14
src/android/nfc/src/org/qtproject/qt5/android/nfc/QtNfc.java
src/bluetooth/android/androidbroadcastreceiver.cpp
+21
-15
src/bluetooth/android/androidbroadcastreceiver.cpp
src/bluetooth/android/androidbroadcastreceiver_p.h
+21
-15
src/bluetooth/android/androidbroadcastreceiver_p.h
src/bluetooth/android/devicediscoverybroadcastreceiver.cpp
+21
-15
src/bluetooth/android/devicediscoverybroadcastreceiver.cpp
src/bluetooth/android/devicediscoverybroadcastreceiver_p.h
+21
-15
src/bluetooth/android/devicediscoverybroadcastreceiver_p.h
src/bluetooth/android/inputstreamthread.cpp
+21
-15
src/bluetooth/android/inputstreamthread.cpp
src/bluetooth/android/inputstreamthread_p.h
+21
-15
src/bluetooth/android/inputstreamthread_p.h
src/bluetooth/android/jni_android.cpp
+21
-15
src/bluetooth/android/jni_android.cpp
src/bluetooth/android/jni_android_p.h
+20
-14
src/bluetooth/android/jni_android_p.h
src/bluetooth/android/localdevicebroadcastreceiver.cpp
+20
-14
src/bluetooth/android/localdevicebroadcastreceiver.cpp
with
2194 additions
and
238 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