diff options
| author | Alex Blasche <alexander.blasche@digia.com> | 2014-02-17 10:38:48 +0100 |
|---|---|---|
| committer | Alex Blasche <alexander.blasche@digia.com> | 2014-02-17 10:38:48 +0100 |
| commit | 8fe7fbe6b552b0d196967cfea85fede5e7c211b9 (patch) | |
| tree | b90f246cc3b8847cedaf6b5f8dc045cfc563b9be /src/bluetooth/bluetooth.pro | |
| parent | 9bcb79f0c741f7805dad17c467a5c2041227a18a (diff) | |
| parent | b4bde05d8459cc57c25bac3f7be19fcf03908606 (diff) | |
Merge branch 'dev' into btle
Conflicts:
examples/bluetooth/bluetooth.pro
src/bluetooth/doc/src/examples.qdoc
src/bluetooth/qbluetoothdevicediscoveryagent_qnx.cpp
src/bluetooth/qbluetoothservicediscoveryagent_bluez.cpp
src/bluetooth/qbluetoothservicediscoveryagent_p.h
src/bluetooth/qbluetoothservicediscoveryagent_qnx.cpp
Change-Id: Ie1577e4b0f469cd5a6b05a61cbe94f180a64448d
Diffstat (limited to 'src/bluetooth/bluetooth.pro')
| -rw-r--r-- | src/bluetooth/bluetooth.pro | 25 |
1 files changed, 23 insertions, 2 deletions
diff --git a/src/bluetooth/bluetooth.pro b/src/bluetooth/bluetooth.pro index 69f4b6f8..e5f03db0 100644 --- a/src/bluetooth/bluetooth.pro +++ b/src/bluetooth/bluetooth.pro @@ -89,8 +89,8 @@ config_bluez:qtHaveModule(dbus) { qlowenergyserviceinfo_bluez.cpp \ qlowenergycharacteristicinfo_bluez.cpp -} else:qnx{ - DEFINES += QT_QNX_BLUETOOTH #BT_BBPPSDEBUG +} else:CONFIG(blackberry) { + DEFINES += QT_QNX_BLUETOOTH include(qnx/qnx.pri) @@ -114,6 +114,27 @@ config_bluez:qtHaveModule(dbus) { qlowenergyserviceinfo_qnx.cpp \ qlowenergyprocess_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") |