diff options
| author | Alex Blasche <alexander.blasche@digia.com> | 2014-02-10 15:37:17 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-02-13 09:47:27 +0100 |
| commit | 173d16efb54ccc152f19afb9b1c2a87915fb414b (patch) | |
| tree | f07ce85ba2cb973e3c08f3ed84252d92ee1c16de /src/bluetooth/qbluetoothserver_bluez.cpp | |
| parent | dd75b1f776695006ca96fd43f995c3ba0549b968 (diff) | |
Port QtBluetooth to Android
This is a feature merge to dev targeting Qt 5.3.
Known issues:
-QTBUG-36754: QBluetoothServer::close() crashes
-QTBUG-36763: QBluetothTransferManager port to Android not possible
-QTBUG-36764: Improve QBluetoothLocalDevice::connectedDevices()
-QTBUG-36810: Remove direct use of Android action strings
The above issues and some other minor TODO's will be addressed
until final release time.
Task-number: QTBUG-33792
[ChangeLog][QtBluetooth][Android] QtBluetooth has been ported to
Android.
Change-Id: I31ba83e3b7d6aa68e7258b7e43235de7d1a6e68a
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
Diffstat (limited to 'src/bluetooth/qbluetoothserver_bluez.cpp')
| -rw-r--r-- | src/bluetooth/qbluetoothserver_bluez.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/bluetooth/qbluetoothserver_bluez.cpp b/src/bluetooth/qbluetoothserver_bluez.cpp index 8acd8e20..3cbb708c 100644 --- a/src/bluetooth/qbluetoothserver_bluez.cpp +++ b/src/bluetooth/qbluetoothserver_bluez.cpp @@ -201,7 +201,7 @@ bool QBluetoothServer::hasPendingConnections() const if (!d || !d->socketNotifier) return false; - // if the socket notifier is disable there is a pending connection waiting for us to accept. + // if the socket notifier is disabled there is a pending connection waiting for us to accept. return !d->socketNotifier->isEnabled(); } |