diff options
| author | Lars Knoll <lars.knoll@qt.io> | 2016-10-26 10:45:42 +0200 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@qt.io> | 2016-11-01 14:50:29 +0000 |
| commit | 3dbea0c3f9333235629b3249115cd300f8f41112 (patch) | |
| tree | d9e0be12c61305dd8810a916b97d58d92352cc84 /tests | |
| parent | d464779fe2afba8c66a0987813d2f2dab7af89ea (diff) | |
Convert qtconnectivity to the new configure system
Properly do the detection of bluez and the linux crypto API,
and don't run pkg-config at build time.
Change-Id: I0f082992c0f82e90e611283ff0c2cc0143e74bd6
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Diffstat (limited to 'tests')
3 files changed, 7 insertions, 7 deletions
diff --git a/tests/auto/qbluetoothdevicediscoveryagent/qbluetoothdevicediscoveryagent.pro b/tests/auto/qbluetoothdevicediscoveryagent/qbluetoothdevicediscoveryagent.pro index e012ae52..96880930 100644 --- a/tests/auto/qbluetoothdevicediscoveryagent/qbluetoothdevicediscoveryagent.pro +++ b/tests/auto/qbluetoothdevicediscoveryagent/qbluetoothdevicediscoveryagent.pro @@ -2,9 +2,9 @@ SOURCES += tst_qbluetoothdevicediscoveryagent.cpp TARGET=tst_qbluetoothdevicediscoveryagent CONFIG += testcase -QT = core concurrent bluetooth testlib +QT = core concurrent bluetooth-private testlib osx:QT += widgets -config_bluez:qtHaveModule(dbus) { +qtConfig(bluez):qtHaveModule(dbus) { DEFINES += QT_BLUEZ_BLUETOOTH } diff --git a/tests/auto/qbluetoothsocket/qbluetoothsocket.pro b/tests/auto/qbluetoothsocket/qbluetoothsocket.pro index 641ff6c7..8c9b2acb 100644 --- a/tests/auto/qbluetoothsocket/qbluetoothsocket.pro +++ b/tests/auto/qbluetoothsocket/qbluetoothsocket.pro @@ -3,7 +3,7 @@ TARGET = tst_qbluetoothsocket CONFIG += testcase testcase.timeout = 250 # this test is slow -QT = core concurrent network bluetooth testlib +QT = core concurrent network bluetooth-private testlib osx:QT += widgets OTHER_FILES += \ @@ -11,8 +11,8 @@ OTHER_FILES += \ osx { DEFINES += QT_OSX_BLUETOOTH -} else:android { +} else: android { DEFINES += QT_ANDROID_BLUETOOTH -} config_bluez:qtHaveModule(dbus) { +} else: qtConfig(bluez):qtHaveModule(dbus) { DEFINES += QT_BLUEZ_BLUETOOTH } diff --git a/tests/auto/qlowenergycontroller-gattserver/test/test.pro b/tests/auto/qlowenergycontroller-gattserver/test/test.pro index 45cff660..fc9c7a18 100644 --- a/tests/auto/qlowenergycontroller-gattserver/test/test.pro +++ b/tests/auto/qlowenergycontroller-gattserver/test/test.pro @@ -3,7 +3,7 @@ QT = core bluetooth bluetooth-private testlib TARGET = tst_qlowenergycontroller-gattserver CONFIG += testcase c++11 -config_linux_crypto_api:DEFINES += CONFIG_LINUX_CRYPTO_API -config_bluez_le:DEFINES += CONFIG_BLUEZ_LE +qtConfig(linux_crypto_api): DEFINES += CONFIG_LINUX_CRYPTO_API +qtConfig(bluez_le): DEFINES += CONFIG_BLUEZ_LE SOURCES += tst_qlowenergycontroller-gattserver.cpp |