From eb2e434dda5c46028474c76ce5f4921a7217b45c Mon Sep 17 00:00:00 2001 From: Alexandru Croitor Date: Wed, 5 Feb 2020 14:12:37 +0100 Subject: Regenerate projects to handle private deps Change-Id: If29798f67b1a27ffd886a21facb5ca8924aa9604 Reviewed-by: Leander Beernaert Reviewed-by: Alexandru Croitor --- src/bluetooth/.prev_CMakeLists.txt | 4 ++++ src/bluetooth/CMakeLists.txt | 4 ++++ tests/auto/qbluetoothdevicediscoveryagent/CMakeLists.txt | 4 +--- tests/auto/qbluetoothlocaldevice/CMakeLists.txt | 4 +--- tests/auto/qbluetoothserver/CMakeLists.txt | 4 +--- tests/auto/qbluetoothsocket/CMakeLists.txt | 4 +--- tests/auto/qlowenergycontroller-gattserver/test/CMakeLists.txt | 3 +-- tests/auto/qlowenergycontroller/CMakeLists.txt | 4 +--- tests/auto/qnearfieldmanager/.prev_CMakeLists.txt | 4 +--- tests/auto/qnearfieldmanager/CMakeLists.txt | 4 +--- tests/auto/qnearfieldtagtype1/.prev_CMakeLists.txt | 4 +--- tests/auto/qnearfieldtagtype1/CMakeLists.txt | 4 +--- tests/auto/qnearfieldtagtype2/.prev_CMakeLists.txt | 4 +--- tests/auto/qnearfieldtagtype2/CMakeLists.txt | 4 +--- 14 files changed, 20 insertions(+), 35 deletions(-) diff --git a/src/bluetooth/.prev_CMakeLists.txt b/src/bluetooth/.prev_CMakeLists.txt index 95491c1f..990a3636 100644 --- a/src/bluetooth/.prev_CMakeLists.txt +++ b/src/bluetooth/.prev_CMakeLists.txt @@ -43,6 +43,8 @@ qt_add_module(Bluetooth Qt::CorePrivate PUBLIC_LIBRARIES Qt::Core + PRIVATE_MODULE_INTERFACE + Qt::CorePrivate ) #### Keys ignored in scope 1:.:.:bluetooth.pro:: @@ -237,6 +239,8 @@ qt_extend_target(Bluetooth CONDITION QT_FEATURE_winrt_bt AND NOT APPLE_IOS AND N Qt::CorePrivate PUBLIC_LIBRARIES Qt::Core + PRIVATE_MODULE_INTERFACE + Qt::CorePrivate ) qt_extend_target(Bluetooth CONDITION QT_FEATURE_winrt_bt AND NOT APPLE_IOS AND NOT APPLE_OSX AND NOT APPLE_TVOS AND NOT QT_FEATURE_bluez AND NOT WINRT AND (ANDROID_EMBEDDED OR NOT ANDROID) diff --git a/src/bluetooth/CMakeLists.txt b/src/bluetooth/CMakeLists.txt index 79914aa6..b102f12b 100644 --- a/src/bluetooth/CMakeLists.txt +++ b/src/bluetooth/CMakeLists.txt @@ -43,6 +43,8 @@ qt_add_module(Bluetooth Qt::CorePrivate PUBLIC_LIBRARIES Qt::Core + PRIVATE_MODULE_INTERFACE + Qt::CorePrivate ) #### Keys ignored in scope 1:.:.:bluetooth.pro:: @@ -254,6 +256,8 @@ qt_extend_target(Bluetooth CONDITION QT_FEATURE_winrt_bt AND NOT APPLE_IOS AND N Qt::CorePrivate PUBLIC_LIBRARIES Qt::Core + PRIVATE_MODULE_INTERFACE + Qt::CorePrivate ) qt_extend_target(Bluetooth CONDITION QT_FEATURE_winrt_bt AND NOT APPLE_IOS AND NOT APPLE_OSX AND NOT APPLE_TVOS AND NOT QT_FEATURE_bluez AND NOT WINRT AND (ANDROID_EMBEDDED OR NOT ANDROID) diff --git a/tests/auto/qbluetoothdevicediscoveryagent/CMakeLists.txt b/tests/auto/qbluetoothdevicediscoveryagent/CMakeLists.txt index 309b1213..55cd50c7 100644 --- a/tests/auto/qbluetoothdevicediscoveryagent/CMakeLists.txt +++ b/tests/auto/qbluetoothdevicediscoveryagent/CMakeLists.txt @@ -7,10 +7,8 @@ qt_add_test(tst_qbluetoothdevicediscoveryagent SOURCES tst_qbluetoothdevicediscoveryagent.cpp - LIBRARIES - Qt::BluetoothPrivate PUBLIC_LIBRARIES - Qt::Bluetooth + Qt::BluetoothPrivate Qt::Concurrent ) diff --git a/tests/auto/qbluetoothlocaldevice/CMakeLists.txt b/tests/auto/qbluetoothlocaldevice/CMakeLists.txt index 841bcdfc..40f1bd94 100644 --- a/tests/auto/qbluetoothlocaldevice/CMakeLists.txt +++ b/tests/auto/qbluetoothlocaldevice/CMakeLists.txt @@ -7,10 +7,8 @@ qt_add_test(tst_qbluetoothlocaldevice SOURCES tst_qbluetoothlocaldevice.cpp - LIBRARIES - Qt::BluetoothPrivate PUBLIC_LIBRARIES - Qt::Bluetooth + Qt::BluetoothPrivate Qt::Concurrent ) diff --git a/tests/auto/qbluetoothserver/CMakeLists.txt b/tests/auto/qbluetoothserver/CMakeLists.txt index 72444957..6437488c 100644 --- a/tests/auto/qbluetoothserver/CMakeLists.txt +++ b/tests/auto/qbluetoothserver/CMakeLists.txt @@ -7,10 +7,8 @@ qt_add_test(tst_qbluetoothserver SOURCES tst_qbluetoothserver.cpp - LIBRARIES - Qt::BluetoothPrivate PUBLIC_LIBRARIES - Qt::Bluetooth + Qt::BluetoothPrivate Qt::Concurrent ) diff --git a/tests/auto/qbluetoothsocket/CMakeLists.txt b/tests/auto/qbluetoothsocket/CMakeLists.txt index febf1920..a51e0645 100644 --- a/tests/auto/qbluetoothsocket/CMakeLists.txt +++ b/tests/auto/qbluetoothsocket/CMakeLists.txt @@ -7,10 +7,8 @@ qt_add_test(tst_qbluetoothsocket SOURCES tst_qbluetoothsocket.cpp - LIBRARIES - Qt::BluetoothPrivate PUBLIC_LIBRARIES - Qt::Bluetooth + Qt::BluetoothPrivate Qt::Concurrent Qt::Network ) diff --git a/tests/auto/qlowenergycontroller-gattserver/test/CMakeLists.txt b/tests/auto/qlowenergycontroller-gattserver/test/CMakeLists.txt index 8720bdc5..bcd676fc 100644 --- a/tests/auto/qlowenergycontroller-gattserver/test/CMakeLists.txt +++ b/tests/auto/qlowenergycontroller-gattserver/test/CMakeLists.txt @@ -7,10 +7,9 @@ qt_add_test(tst_qlowenergycontroller-gattserver SOURCES tst_qlowenergycontroller-gattserver.cpp - LIBRARIES - Qt::BluetoothPrivate PUBLIC_LIBRARIES Qt::Bluetooth + Qt::BluetoothPrivate ) ## Scopes: diff --git a/tests/auto/qlowenergycontroller/CMakeLists.txt b/tests/auto/qlowenergycontroller/CMakeLists.txt index bfa973a1..a701ab5e 100644 --- a/tests/auto/qlowenergycontroller/CMakeLists.txt +++ b/tests/auto/qlowenergycontroller/CMakeLists.txt @@ -7,10 +7,8 @@ qt_add_test(tst_qlowenergycontroller SOURCES tst_qlowenergycontroller.cpp - LIBRARIES - Qt::BluetoothPrivate PUBLIC_LIBRARIES - Qt::Bluetooth + Qt::BluetoothPrivate ) ## Scopes: diff --git a/tests/auto/qnearfieldmanager/.prev_CMakeLists.txt b/tests/auto/qnearfieldmanager/.prev_CMakeLists.txt index e1e64ae0..4a6214d6 100644 --- a/tests/auto/qnearfieldmanager/.prev_CMakeLists.txt +++ b/tests/auto/qnearfieldmanager/.prev_CMakeLists.txt @@ -23,10 +23,8 @@ qt_add_test(tst_qnearfieldmanager SRCDIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../nfcdata\\\" INCLUDE_DIRECTORIES ../../../src/nfc - LIBRARIES - Qt::NfcPrivate PUBLIC_LIBRARIES - Qt::Nfc + Qt::NfcPrivate TESTDATA ${test_data} ) diff --git a/tests/auto/qnearfieldmanager/CMakeLists.txt b/tests/auto/qnearfieldmanager/CMakeLists.txt index 3b001903..ae753d05 100644 --- a/tests/auto/qnearfieldmanager/CMakeLists.txt +++ b/tests/auto/qnearfieldmanager/CMakeLists.txt @@ -25,10 +25,8 @@ qt_add_test(tst_qnearfieldmanager SRCDIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../nfcdata\\\" INCLUDE_DIRECTORIES ../../../src/nfc - LIBRARIES - Qt::NfcPrivate PUBLIC_LIBRARIES - Qt::Nfc + Qt::NfcPrivate TESTDATA ${test_data} ) diff --git a/tests/auto/qnearfieldtagtype1/.prev_CMakeLists.txt b/tests/auto/qnearfieldtagtype1/.prev_CMakeLists.txt index bb449175..18759842 100644 --- a/tests/auto/qnearfieldtagtype1/.prev_CMakeLists.txt +++ b/tests/auto/qnearfieldtagtype1/.prev_CMakeLists.txt @@ -23,10 +23,8 @@ qt_add_test(tst_qnearfieldtagtype1 SRCDIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../nfcdata\\\" INCLUDE_DIRECTORIES ../../../src/nfc - LIBRARIES - Qt::NfcPrivate PUBLIC_LIBRARIES - Qt::Nfc + Qt::NfcPrivate TESTDATA ${test_data} ) diff --git a/tests/auto/qnearfieldtagtype1/CMakeLists.txt b/tests/auto/qnearfieldtagtype1/CMakeLists.txt index c05f645d..17fdc05b 100644 --- a/tests/auto/qnearfieldtagtype1/CMakeLists.txt +++ b/tests/auto/qnearfieldtagtype1/CMakeLists.txt @@ -25,10 +25,8 @@ qt_add_test(tst_qnearfieldtagtype1 SRCDIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../nfcdata\\\" INCLUDE_DIRECTORIES ../../../src/nfc - LIBRARIES - Qt::NfcPrivate PUBLIC_LIBRARIES - Qt::Nfc + Qt::NfcPrivate TESTDATA ${test_data} ) diff --git a/tests/auto/qnearfieldtagtype2/.prev_CMakeLists.txt b/tests/auto/qnearfieldtagtype2/.prev_CMakeLists.txt index a337d3ed..5687d44e 100644 --- a/tests/auto/qnearfieldtagtype2/.prev_CMakeLists.txt +++ b/tests/auto/qnearfieldtagtype2/.prev_CMakeLists.txt @@ -23,10 +23,8 @@ qt_add_test(tst_qnearfieldtagtype2 SRCDIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/nfcdata\\\" INCLUDE_DIRECTORIES ../../../src/nfc - LIBRARIES - Qt::NfcPrivate PUBLIC_LIBRARIES - Qt::Nfc + Qt::NfcPrivate TESTDATA ${test_data} ) diff --git a/tests/auto/qnearfieldtagtype2/CMakeLists.txt b/tests/auto/qnearfieldtagtype2/CMakeLists.txt index bcc921d3..d7ab56fe 100644 --- a/tests/auto/qnearfieldtagtype2/CMakeLists.txt +++ b/tests/auto/qnearfieldtagtype2/CMakeLists.txt @@ -25,10 +25,8 @@ qt_add_test(tst_qnearfieldtagtype2 SRCDIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/nfcdata\\\" INCLUDE_DIRECTORIES ../../../src/nfc - LIBRARIES - Qt::NfcPrivate PUBLIC_LIBRARIES - Qt::Nfc + Qt::NfcPrivate TESTDATA ${test_data} ) -- cgit v1.2.1