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/bluetooth.pro | |
| 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/bluetooth.pro')
| -rw-r--r-- | src/bluetooth/bluetooth.pro | 21 |
1 files changed, 21 insertions, 0 deletions
diff --git a/src/bluetooth/bluetooth.pro b/src/bluetooth/bluetooth.pro index d7214f2c..44d2444c 100644 --- a/src/bluetooth/bluetooth.pro +++ b/src/bluetooth/bluetooth.pro @@ -94,6 +94,27 @@ config_bluez:qtHaveModule(dbus) { qbluetoothserver_qnx.cpp \ qbluetoothtransferreply_qnx.cpp +} else:android:!android-no-sdk { + include(android/android.pri) + DEFINES += QT_ANDROID_BLUETOOTH + QT += core-private androidextras + + ANDROID_PERMISSIONS = \ + android.permission.BLUETOOTH \ + android.permission.BLUETOOTH_ADMIN + ANDROID_BUNDLED_JAR_DEPENDENCIES = \ + jar/QtAndroidBluetooth-bundled.jar:org.qtproject.qt5.android.bluetooth.QtBluetoothBroadcastReceiver + ANDROID_JAR_DEPENDENCIES = \ + jar/QtAndroidBluetooth.jar:org.qtproject.qt5.android.bluetooth.QtBluetoothBroadcastReceiver + + SOURCES += \ + qbluetoothdevicediscoveryagent_android.cpp \ + qbluetoothlocaldevice_android.cpp \ + qbluetoothserviceinfo_android.cpp \ + qbluetoothservicediscoveryagent_android.cpp \ + qbluetoothsocket_android.cpp \ + qbluetoothserver_android.cpp + } else { message("Unsupported bluetooth platform, will not build a working QBluetooth library") message("Either no Qt dBus found or no Bluez headers") |