diff options
20 files changed, 21 insertions, 19 deletions
diff --git a/examples/bluetoothtransferplugin/bluetoothtransferplugin.pro b/examples/bluetoothtransferplugin/bluetoothtransferplugin.pro index 214deb41..9f3f3814 100644 --- a/examples/bluetoothtransferplugin/bluetoothtransferplugin.pro +++ b/examples/bluetoothtransferplugin/bluetoothtransferplugin.pro @@ -2,7 +2,7 @@ TEMPLATE = lib CONFIG += plugin PLUGIN_TYPE=serviceframework -QT += bluetooth serviceframework +QT += concurrent bluetooth serviceframework HEADERS += bluetoothtransferplugin.h \ bluetoothtransfer.h diff --git a/examples/btchat/btchat.pro b/examples/btchat/btchat.pro index 3df3527d..37f4b3ee 100644 --- a/examples/btchat/btchat.pro +++ b/examples/btchat/btchat.pro @@ -1,6 +1,6 @@ TARGET = btchat -QT += bluetooth widgets +QT += concurrent bluetooth widgets INCLUDEPATH += ../../src/connectivity/bluetooth DEPENDPATH += ../../src/connectivity/bluetooth diff --git a/examples/btfiletransfer/btfiletransfer.pro b/examples/btfiletransfer/btfiletransfer.pro index 7d823a17..11a4de4b 100644 --- a/examples/btfiletransfer/btfiletransfer.pro +++ b/examples/btfiletransfer/btfiletransfer.pro @@ -1,6 +1,6 @@ TARGET = btfiletransfer -QT += bluetooth widgets +QT += concurrent bluetooth widgets INCLUDEPATH += ../../src/connectivity/bluetooth DEPENDPATH += ../../src/connectivity/bluetooth diff --git a/examples/btscanner/btscanner.pro b/examples/btscanner/btscanner.pro index 629d7d8f..b09bf294 100644 --- a/examples/btscanner/btscanner.pro +++ b/examples/btscanner/btscanner.pro @@ -3,7 +3,7 @@ TARGET = btscanner INCLUDEPATH += ../../src/connectivity/bluetooth DEPENDPATH += ../../src/connectivity/bluetooth -QT += bluetooth widgets +QT += concurrent bluetooth widgets TEMPLATE = app SOURCES = \ diff --git a/examples/bttennis/bttennis.pro b/examples/bttennis/bttennis.pro index 0532a029..85a93c95 100644 --- a/examples/bttennis/bttennis.pro +++ b/examples/bttennis/bttennis.pro @@ -8,7 +8,7 @@ DEPENDPATH += \ ../../src/connectivity/bluetooth \ ../../src/connectivity/nfc -QT += bluetooth nfc widgets +QT += concurrent bluetooth nfc widgets SOURCES = \ main.cpp \ diff --git a/examples/scanner/scanner.pro b/examples/scanner/scanner.pro index 39eb453b..b83eb5d2 100644 --- a/examples/scanner/scanner.pro +++ b/examples/scanner/scanner.pro @@ -1,4 +1,4 @@ -QT += widgets declarative network bluetooth quick +QT += concurrent widgets declarative network bluetooth quick SOURCES += qmlscanner.cpp TARGET = qml_scanner diff --git a/modules/qt_bluetooth.pri b/modules/qt_bluetooth.pri index 86a0e87a..01531567 100644 --- a/modules/qt_bluetooth.pri +++ b/modules/qt_bluetooth.pri @@ -11,7 +11,7 @@ QT.bluetooth.sources = $$QT_MODULE_BASE/src/bluetooth QT.bluetooth.libs = $$QT_MODULE_LIB_BASE QT.bluetooth.plugins = $$QT_MODULE_PLUGIN_BASE QT.bluetooth.imports = $$QT_MODULE_IMPORT_BASE -QT.bluetooth.depends = core +QT.bluetooth.depends = core concurrent QT.bluetooth.DEFINES = QT_BLUETOOTH_LIB QT_CONFIG += bluetooth diff --git a/src/bluetooth/bluetooth.pro b/src/bluetooth/bluetooth.pro index f1b00b30..8a8521ac 100644 --- a/src/bluetooth/bluetooth.pro +++ b/src/bluetooth/bluetooth.pro @@ -10,6 +10,8 @@ DEFINES += QT_BUILD_BT_LIB QT_MAKEDLL load(qt_module_config) +QT += concurrent + PUBLIC_HEADERS += \ qbluetoothaddress.h\ qbluetoothuuid.h\ diff --git a/tests/auto/qbluetoothaddress/qbluetoothaddress.pro b/tests/auto/qbluetoothaddress/qbluetoothaddress.pro index 8a51143d..f87551e8 100644 --- a/tests/auto/qbluetoothaddress/qbluetoothaddress.pro +++ b/tests/auto/qbluetoothaddress/qbluetoothaddress.pro @@ -2,5 +2,5 @@ SOURCES += tst_qbluetoothaddress.cpp TARGET = tst_qbluetoothaddress CONFIG += testcase -QT = core bluetooth testlib +QT = core concurrent bluetooth testlib diff --git a/tests/auto/qbluetoothdevicediscoveryagent/qbluetoothdevicediscoveryagent.pro b/tests/auto/qbluetoothdevicediscoveryagent/qbluetoothdevicediscoveryagent.pro index de27afe9..f32c17cd 100644 --- a/tests/auto/qbluetoothdevicediscoveryagent/qbluetoothdevicediscoveryagent.pro +++ b/tests/auto/qbluetoothdevicediscoveryagent/qbluetoothdevicediscoveryagent.pro @@ -2,7 +2,7 @@ SOURCES += tst_qbluetoothdevicediscoveryagent.cpp TARGET=tst_qbluetoothdevicediscoveryagent CONFIG += testcase -QT = core bluetooth testlib +QT = core concurrent bluetooth testlib symbian: TARGET.CAPABILITY = ReadDeviceData LocalServices WriteDeviceData diff --git a/tests/auto/qbluetoothdeviceinfo/qbluetoothdeviceinfo.pro b/tests/auto/qbluetoothdeviceinfo/qbluetoothdeviceinfo.pro index 16879754..e0bf7ab2 100644 --- a/tests/auto/qbluetoothdeviceinfo/qbluetoothdeviceinfo.pro +++ b/tests/auto/qbluetoothdeviceinfo/qbluetoothdeviceinfo.pro @@ -2,7 +2,7 @@ SOURCES += tst_qbluetoothdeviceinfo.cpp TARGET=tst_qbluetoothdeviceinfo CONFIG += testcase -QT = core bluetooth testlib +QT = core concurrent bluetooth testlib symbian: TARGET.CAPABILITY = ReadDeviceData LocalServices WriteDeviceData diff --git a/tests/auto/qbluetoothlocaldevice/qbluetoothlocaldevice.pro b/tests/auto/qbluetoothlocaldevice/qbluetoothlocaldevice.pro index c092a971..abb1f3da 100644 --- a/tests/auto/qbluetoothlocaldevice/qbluetoothlocaldevice.pro +++ b/tests/auto/qbluetoothlocaldevice/qbluetoothlocaldevice.pro @@ -2,7 +2,7 @@ SOURCES += tst_qbluetoothlocaldevice.cpp TARGET=tst_qbluetoothlocaldevice CONFIG += testcase -QT = core bluetooth testlib +QT = core concurrent bluetooth testlib symbian: TARGET.CAPABILITY = ReadDeviceData LocalServices WriteDeviceData NetworkControl diff --git a/tests/auto/qbluetoothservicediscoveryagent/qbluetoothservicediscoveryagent.pro b/tests/auto/qbluetoothservicediscoveryagent/qbluetoothservicediscoveryagent.pro index 1c024bb9..f53e0db7 100644 --- a/tests/auto/qbluetoothservicediscoveryagent/qbluetoothservicediscoveryagent.pro +++ b/tests/auto/qbluetoothservicediscoveryagent/qbluetoothservicediscoveryagent.pro @@ -2,7 +2,7 @@ SOURCES += tst_qbluetoothservicediscoveryagent.cpp TARGET = tst_qbluetoothservicediscoveryagent CONFIG += testcase -QT = core bluetooth testlib +QT = core concurrent bluetooth testlib symbian: TARGET.CAPABILITY = ReadDeviceData LocalServices WriteDeviceData diff --git a/tests/auto/qbluetoothserviceinfo/qbluetoothserviceinfo.pro b/tests/auto/qbluetoothserviceinfo/qbluetoothserviceinfo.pro index ef7b9168..c93e4962 100644 --- a/tests/auto/qbluetoothserviceinfo/qbluetoothserviceinfo.pro +++ b/tests/auto/qbluetoothserviceinfo/qbluetoothserviceinfo.pro @@ -2,7 +2,7 @@ SOURCES += tst_qbluetoothserviceinfo.cpp TARGET = tst_qbluetoothserviceinfo CONFIG += testcase -QT = core bluetooth testlib +QT = core concurrent bluetooth testlib symbian: TARGET.CAPABILITY = ReadDeviceData LocalServices WriteDeviceData diff --git a/tests/auto/qbluetoothsocket/qbluetoothsocket.pro b/tests/auto/qbluetoothsocket/qbluetoothsocket.pro index 7b5e0ee6..b98ecf13 100644 --- a/tests/auto/qbluetoothsocket/qbluetoothsocket.pro +++ b/tests/auto/qbluetoothsocket/qbluetoothsocket.pro @@ -2,7 +2,7 @@ SOURCES += tst_qbluetoothsocket.cpp TARGET = tst_qbluetoothsocket CONFIG += testcase -QT = core network bluetooth testlib +QT = core concurrent network bluetooth testlib INCLUDEPATH += ../../../tests/btclient DEPENDPATH += ../../../tests/btclient diff --git a/tests/auto/qbluetoothtransfermanager/qbluetoothtransfermanager.pro b/tests/auto/qbluetoothtransfermanager/qbluetoothtransfermanager.pro index 9dcdbb65..cba068be 100644 --- a/tests/auto/qbluetoothtransfermanager/qbluetoothtransfermanager.pro +++ b/tests/auto/qbluetoothtransfermanager/qbluetoothtransfermanager.pro @@ -2,7 +2,7 @@ SOURCES += tst_qbluetoothtransfermanager.cpp TARGET=tst_qbluetoothtransfermanager CONFIG += testcase -QT = core bluetooth testlib +QT = core concurrent bluetooth testlib INCLUDEPATH += ../../../tests/btclient DEPENDPATH += ../../../tests/btclient diff --git a/tests/auto/qbluetoothtransferrequest/qbluetoothtransferrequest.pro b/tests/auto/qbluetoothtransferrequest/qbluetoothtransferrequest.pro index 47c022ac..15296835 100644 --- a/tests/auto/qbluetoothtransferrequest/qbluetoothtransferrequest.pro +++ b/tests/auto/qbluetoothtransferrequest/qbluetoothtransferrequest.pro @@ -2,7 +2,7 @@ SOURCES += tst_qbluetoothtransferrequest.cpp TARGET=tst_qbluetoothtransferrequest CONFIG += testcase -QT = core bluetooth testlib +QT = core concurrent bluetooth testlib symbian: TARGET.CAPABILITY = ReadDeviceData LocalServices WriteDeviceData diff --git a/tests/auto/qbluetoothuuid/qbluetoothuuid.pro b/tests/auto/qbluetoothuuid/qbluetoothuuid.pro index 445940a8..7ba965d2 100644 --- a/tests/auto/qbluetoothuuid/qbluetoothuuid.pro +++ b/tests/auto/qbluetoothuuid/qbluetoothuuid.pro @@ -2,7 +2,7 @@ SOURCES += tst_qbluetoothuuid.cpp TARGET = tst_qbluetoothuuid CONFIG += testcase -QT = core bluetooth testlib +QT = core concurrent bluetooth testlib symbian: { LIBS *= -lbluetooth diff --git a/tests/auto/ql2capserver/ql2capserver.pro b/tests/auto/ql2capserver/ql2capserver.pro index d59d3b67..9853e045 100644 --- a/tests/auto/ql2capserver/ql2capserver.pro +++ b/tests/auto/ql2capserver/ql2capserver.pro @@ -4,6 +4,6 @@ TARGET = tst_ql2capserver # Note, not really an autotest. Requires manually setting up and running btclient first. #CONFIG += testcase -QT = core bluetooth testlib +QT = core concurrent bluetooth testlib symbian: TARGET.CAPABILITY = LocalServices NetworkControl diff --git a/tests/auto/qrfcommserver/qrfcommserver.pro b/tests/auto/qrfcommserver/qrfcommserver.pro index 770b4f5e..567bb554 100644 --- a/tests/auto/qrfcommserver/qrfcommserver.pro +++ b/tests/auto/qrfcommserver/qrfcommserver.pro @@ -2,7 +2,7 @@ SOURCES += tst_qrfcommserver.cpp TARGET = tst_qrfcommserver CONFIG += testcase -QT = core bluetooth testlib +QT = core concurrent bluetooth testlib symbian: TARGET.CAPABILITY = LocalServices NetworkControl WriteDeviceData |