diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-02-02 03:02:46 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-02-02 03:02:46 +0100 |
| commit | dafbd24e9fcf74bc946111e2bb1547fc3d44e90b (patch) | |
| tree | 8fe08635d99a91bea4b4448cbdf39d3706df6f51 /src/android/bluetooth/src/org/qtproject/qt5/android/bluetooth/QtBluetoothLE.java | |
| parent | 5eb8fd9f69db3b79f37a374f32296f96eb56d6d3 (diff) | |
| parent | 370e84c6d5f7c4f2d3f274ccb250f4baccd4614d (diff) | |
Merge remote-tracking branch 'origin/5.12' into 5.13
Change-Id: Ic64c5646f2a1c1b057f2a27e66b37364a320b12e
Diffstat (limited to 'src/android/bluetooth/src/org/qtproject/qt5/android/bluetooth/QtBluetoothLE.java')
| -rw-r--r-- | src/android/bluetooth/src/org/qtproject/qt5/android/bluetooth/QtBluetoothLE.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/android/bluetooth/src/org/qtproject/qt5/android/bluetooth/QtBluetoothLE.java b/src/android/bluetooth/src/org/qtproject/qt5/android/bluetooth/QtBluetoothLE.java index 4063537b..dc48514a 100644 --- a/src/android/bluetooth/src/org/qtproject/qt5/android/bluetooth/QtBluetoothLE.java +++ b/src/android/bluetooth/src/org/qtproject/qt5/android/bluetooth/QtBluetoothLE.java @@ -532,7 +532,7 @@ public class QtBluetoothLE { } try { - // BluetoothDevice.,connectGatt(Context, boolean, BluetoothGattCallback, int) was + // BluetoothDevice.connectGatt(Context, boolean, BluetoothGattCallback, int) was // officially introduced by Android API v23. Earlier Android versions have a private // implementation already though. Let's check at runtime and use it if possible. // @@ -1126,7 +1126,7 @@ public class QtBluetoothLE { return true; } - // Called by TimeoutRunnable if the current I/O job timeoutd out. + // Called by TimeoutRunnable if the current I/O job timed out. // By the time we reach this point the handleForTimeout counter has already been reset // and the regular responses will be blocked off. private void interruptCurrentIO(int handle) |