1 files changed, 23 insertions, 5 deletions

diff --git a/src/bluetooth/bluetooth.pro b/src/bluetooth/bluetooth.pro
index 89839be1..a614516f 100644
--- a/src/bluetooth/bluetooth.pro
+++ b/src/bluetooth/bluetooth.pro
@@ -1,5 +1,5 @@
 TARGET = QtBluetooth
-QT = core
+QT = core core-private
 QT_PRIVATE = concurrent
 
 
@@ -22,9 +22,15 @@ PUBLIC_HEADERS += \
     qbluetoothtransfermanager.h \
     qbluetoothtransferrequest.h \
     qlowenergyservice.h \
+    qlowenergyservicedata.h \
     qlowenergycharacteristic.h \
+    qlowenergycharacteristicdata.h \
     qlowenergydescriptor.h \
+    qlowenergydescriptordata.h \
     qbluetoothtransferreply.h \
+    qlowenergyadvertisingdata.h \
+    qlowenergyadvertisingparameters.h \
+    qlowenergyconnectionparameters.h \
     qlowenergycontroller.h
 
 PRIVATE_HEADERS += \
@@ -41,7 +47,9 @@ PRIVATE_HEADERS += \
     qprivatelinearbuffer_p.h \
     qbluetoothlocaldevice_p.h \
     qlowenergycontroller_p.h \
-    qlowenergyserviceprivate_p.h
+    qlowenergyserviceprivate_p.h \
+    qleadvertiser_p.h \
+    lecmaccalculator_p.h
 
 SOURCES += \
     qbluetoothaddress.cpp\
@@ -58,9 +66,15 @@ SOURCES += \
     qbluetoothtransfermanager.cpp \
     qbluetoothtransferrequest.cpp \
     qbluetoothtransferreply.cpp \
+    qlowenergyadvertisingdata.cpp \
+    qlowenergyadvertisingparameters.cpp \
+    qlowenergyconnectionparameters.cpp \
     qlowenergyservice.cpp \
+    qlowenergyservicedata.cpp \
     qlowenergycharacteristic.cpp \
+    qlowenergycharacteristicdata.cpp \
     qlowenergydescriptor.cpp \
+    qlowenergydescriptordata.cpp \
     qlowenergycontroller.cpp \
     qlowenergyserviceprivate.cpp
 
@@ -86,7 +100,11 @@ config_bluez:qtHaveModule(dbus) {
     # old versions of Bluez do not have the required BTLE symbols
     config_bluez_le {
         SOURCES +=  \
-            qlowenergycontroller_bluez.cpp
+            qleadvertiser_bluez.cpp \
+            qlowenergycontroller_bluez.cpp \
+            lecmaccalculator.cpp
+        config_linux_crypto_api:DEFINES += CONFIG_LINUX_CRYPTO_API
+        else:message("Linux crypto API not present, signed writes will not work.")
     } else {
         message("Bluez version is too old to support Bluetooth Low Energy.")
         message("Only classic Bluetooth will be available.")
@@ -95,7 +113,7 @@ config_bluez:qtHaveModule(dbus) {
             qlowenergycontroller_p.cpp
     }
 
-} else:android:!android-no-sdk {
+} else:android {
     include(android/android.pri)
     DEFINES += QT_ANDROID_BLUETOOTH
     QT_FOR_PRIVATE += core-private androidextras
@@ -153,7 +171,7 @@ config_bluez:qtHaveModule(dbus) {
     SOURCES -= qlowenergyservice.cpp
     SOURCES -= qlowenergycontroller.cpp
     SOURCES -= qlowenergycontroller_p.cpp
-} else:ios {
+} else:ios|tvos {
     DEFINES += QT_IOS_BLUETOOTH
     LIBS_PRIVATE += -framework Foundation -framework CoreBluetooth