diff options
118 files changed, 21 insertions, 1595 deletions
diff --git a/.prev_CMakeLists.txt b/.prev_CMakeLists.txt deleted file mode 100644 index 5285aa7f..00000000 --- a/.prev_CMakeLists.txt +++ /dev/null @@ -1,24 +0,0 @@ -# Generated from qtconnectivity.pro. - -cmake_minimum_required(VERSION 3.15.0) - -include(.cmake.conf) -project(connectivity_FIXME - VERSION "${QT_REPO_MODULE_VERSION}" - DESCRIPTION "Qt connectivity_FIXME Libraries" - HOMEPAGE_URL "https://qt.io/" - LANGUAGES CXX C -) - -find_package(Qt6 ${PROJECT_VERSION} CONFIG REQUIRED COMPONENTS BuildInternals Core SET_ME_TO_SOMETHING_USEFUL) -find_package(Qt6 ${PROJECT_VERSION} CONFIG OPTIONAL_COMPONENTS SET_ME_TO_SOMETHING_USEFUL) - -if(NOT TARGET Qt::Network) - message(NOTICE "Skipping the build as the condition \"TARGET Qt::Network\" is not met.") - return() -endif() -if(ANDROID AND NOT TARGET Qt::AndroidExtras) - message(NOTICE "Skipping the build as the condition \"TARGET Qt::AndroidExtras OR NOT ANDROID\" is not met.") - return() -endif() -qt_build_repo() diff --git a/CMakeLists.txt b/CMakeLists.txt index 790065c3..1414cd05 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,16 +1,13 @@ -# Generated from qtconnectivity.pro. - cmake_minimum_required(VERSION 3.15.0) include(.cmake.conf) -project(QtConnectivity # special case +project(QtConnectivity VERSION 6.0.0 - DESCRIPTION "Qt Connectivity Libraries" # special case + DESCRIPTION "Qt Connectivity Libraries" HOMEPAGE_URL "https://qt.io/" LANGUAGES CXX C ) -# special case begin set(QT_REPO_NOT_WARNINGS_CLEAN TRUE) find_package(Qt6 ${PROJECT_VERSION} CONFIG REQUIRED COMPONENTS BuildInternals Core Network Concurrent) @@ -18,7 +15,6 @@ find_package(Qt6 ${PROJECT_VERSION} CONFIG OPTIONAL_COMPONENTS DBus Gui Widgets if(ANDROID) find_package(Qt6 ${PROJECT_VERSION} CONFIG REQUIRED COMPONENTS AndroidExtras) endif() -# special case end if(NOT TARGET Qt::Network) message(NOTICE "Skipping the build as the condition \"TARGET Qt::Network\" is not met.") diff --git a/config.tests/bluez/CMakeLists.txt b/config.tests/bluez/CMakeLists.txt index 86e1473d..8238cc95 100644 --- a/config.tests/bluez/CMakeLists.txt +++ b/config.tests/bluez/CMakeLists.txt @@ -1,5 +1,3 @@ -# Generated from bluez.pro. - cmake_minimum_required(VERSION 3.14.0) project(config_test_bluez LANGUAGES C CXX) diff --git a/config.tests/bluez/bluez.pro b/config.tests/bluez/bluez.pro deleted file mode 100644 index 8bbff78a..00000000 --- a/config.tests/bluez/bluez.pro +++ /dev/null @@ -1,5 +0,0 @@ -SOURCES += main.cpp - -# test checks existence of certain bluez defines whose -# usage is known to violate the permissive test -QMAKE_CXXFLAGS += -fpermissive diff --git a/config.tests/bluez_le/CMakeLists.txt b/config.tests/bluez_le/CMakeLists.txt index 88fe9d8f..4eff292d 100644 --- a/config.tests/bluez_le/CMakeLists.txt +++ b/config.tests/bluez_le/CMakeLists.txt @@ -1,5 +1,3 @@ -# Generated from bluez_le.pro. - cmake_minimum_required(VERSION 3.14.0) project(config_test_bluez_le LANGUAGES C CXX) diff --git a/config.tests/bluez_le/bluez_le.pro b/config.tests/bluez_le/bluez_le.pro deleted file mode 100644 index 28dcadcb..00000000 --- a/config.tests/bluez_le/bluez_le.pro +++ /dev/null @@ -1 +0,0 @@ -SOURCES += main.cpp diff --git a/config.tests/linux_crypto_api/CMakeLists.txt b/config.tests/linux_crypto_api/CMakeLists.txt index 58c6c381..7b388343 100644 --- a/config.tests/linux_crypto_api/CMakeLists.txt +++ b/config.tests/linux_crypto_api/CMakeLists.txt @@ -1,5 +1,3 @@ -# Generated from linux_crypto_api.pro. - cmake_minimum_required(VERSION 3.14.0) project(config_test_linux_crypto_api LANGUAGES C CXX) diff --git a/config.tests/linux_crypto_api/linux_crypto_api.pro b/config.tests/linux_crypto_api/linux_crypto_api.pro deleted file mode 100644 index 7dff17fa..00000000 --- a/config.tests/linux_crypto_api/linux_crypto_api.pro +++ /dev/null @@ -1,5 +0,0 @@ -TEMPLATE = app - -TARGET = linux_crypto_api - -SOURCES += main.cpp diff --git a/config.tests/winrt_bt/CMakeLists.txt b/config.tests/winrt_bt/CMakeLists.txt index a03541aa..6194843b 100644 --- a/config.tests/winrt_bt/CMakeLists.txt +++ b/config.tests/winrt_bt/CMakeLists.txt @@ -1,5 +1,3 @@ -# Generated from winrt.pro. - cmake_minimum_required(VERSION 3.14.0) project(config_test_winrt LANGUAGES C CXX) diff --git a/config.tests/winrt_bt/winrt.pro b/config.tests/winrt_bt/winrt.pro deleted file mode 100644 index 4d746e3d..00000000 --- a/config.tests/winrt_bt/winrt.pro +++ /dev/null @@ -1,3 +0,0 @@ -SOURCES += main.cpp - -LIBS += runtimeobject.lib diff --git a/config.tests/winrt_btle_no_pairing/CMakeLists.txt b/config.tests/winrt_btle_no_pairing/CMakeLists.txt index a03541aa..6194843b 100644 --- a/config.tests/winrt_btle_no_pairing/CMakeLists.txt +++ b/config.tests/winrt_btle_no_pairing/CMakeLists.txt @@ -1,5 +1,3 @@ -# Generated from winrt.pro. - cmake_minimum_required(VERSION 3.14.0) project(config_test_winrt LANGUAGES C CXX) diff --git a/config.tests/winrt_btle_no_pairing/winrt.pro b/config.tests/winrt_btle_no_pairing/winrt.pro deleted file mode 100644 index 4d746e3d..00000000 --- a/config.tests/winrt_btle_no_pairing/winrt.pro +++ /dev/null @@ -1,3 +0,0 @@ -SOURCES += main.cpp - -LIBS += runtimeobject.lib diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt index 43e2a22a..c814e52e 100644 --- a/examples/CMakeLists.txt +++ b/examples/CMakeLists.txt @@ -1,5 +1,3 @@ -# Generated from examples.pro. - qt_examples_build_begin() if(TARGET Qt::Bluetooth) diff --git a/examples/bluetooth/CMakeLists.txt b/examples/bluetooth/CMakeLists.txt index 7cf02601..1ca5ef4f 100644 --- a/examples/bluetooth/CMakeLists.txt +++ b/examples/bluetooth/CMakeLists.txt @@ -1,5 +1,3 @@ -# Generated from bluetooth.pro. - add_subdirectory(heartrate-server) if(TARGET Qt::Widgets) add_subdirectory(btchat) diff --git a/examples/bluetooth/btchat/CMakeLists.txt b/examples/bluetooth/btchat/CMakeLists.txt index 44b978b7..7a137056 100644 --- a/examples/bluetooth/btchat/CMakeLists.txt +++ b/examples/bluetooth/btchat/CMakeLists.txt @@ -1,5 +1,3 @@ -# Generated from btchat.pro. - cmake_minimum_required(VERSION 3.14) project(btchat LANGUAGES CXX) diff --git a/examples/bluetooth/btfiletransfer/CMakeLists.txt b/examples/bluetooth/btfiletransfer/CMakeLists.txt index 21b9ac6c..fa1449c2 100644 --- a/examples/bluetooth/btfiletransfer/CMakeLists.txt +++ b/examples/bluetooth/btfiletransfer/CMakeLists.txt @@ -1,5 +1,3 @@ -# Generated from btfiletransfer.pro. - cmake_minimum_required(VERSION 3.14) project(btfiletransfer LANGUAGES CXX) diff --git a/examples/bluetooth/btscanner/CMakeLists.txt b/examples/bluetooth/btscanner/CMakeLists.txt index 65585cf3..f7dba53d 100644 --- a/examples/bluetooth/btscanner/CMakeLists.txt +++ b/examples/bluetooth/btscanner/CMakeLists.txt @@ -1,5 +1,3 @@ -# Generated from btscanner.pro. - cmake_minimum_required(VERSION 3.14) project(btscanner LANGUAGES CXX) diff --git a/examples/bluetooth/chat/CMakeLists.txt b/examples/bluetooth/chat/CMakeLists.txt index e4f90d41..1adbac57 100644 --- a/examples/bluetooth/chat/CMakeLists.txt +++ b/examples/bluetooth/chat/CMakeLists.txt @@ -1,5 +1,3 @@ -# Generated from chat.pro. - cmake_minimum_required(VERSION 3.14) project(qml_chat LANGUAGES CXX) diff --git a/examples/bluetooth/heartrate-game/CMakeLists.txt b/examples/bluetooth/heartrate-game/CMakeLists.txt index ae800b66..fe252eec 100644 --- a/examples/bluetooth/heartrate-game/CMakeLists.txt +++ b/examples/bluetooth/heartrate-game/CMakeLists.txt @@ -1,5 +1,3 @@ -# Generated from heartrate-game.pro. - cmake_minimum_required(VERSION 3.14) project(heartrate-game LANGUAGES CXX) diff --git a/examples/bluetooth/heartrate-server/CMakeLists.txt b/examples/bluetooth/heartrate-server/CMakeLists.txt index 4baa3c0f..53286f7e 100644 --- a/examples/bluetooth/heartrate-server/CMakeLists.txt +++ b/examples/bluetooth/heartrate-server/CMakeLists.txt @@ -1,5 +1,3 @@ -# Generated from heartrate-server.pro. - cmake_minimum_required(VERSION 3.14) project(heartrate-server LANGUAGES CXX) diff --git a/examples/bluetooth/lowenergyscanner/CMakeLists.txt b/examples/bluetooth/lowenergyscanner/CMakeLists.txt index 45d400a3..499c4be1 100644 --- a/examples/bluetooth/lowenergyscanner/CMakeLists.txt +++ b/examples/bluetooth/lowenergyscanner/CMakeLists.txt @@ -1,5 +1,3 @@ -# Generated from lowenergyscanner.pro. - cmake_minimum_required(VERSION 3.14) project(lowenergyscanner LANGUAGES CXX) diff --git a/examples/bluetooth/picturetransfer/CMakeLists.txt b/examples/bluetooth/picturetransfer/CMakeLists.txt index 666b0df6..3a597f70 100644 --- a/examples/bluetooth/picturetransfer/CMakeLists.txt +++ b/examples/bluetooth/picturetransfer/CMakeLists.txt @@ -1,5 +1,3 @@ -# Generated from picturetransfer.pro. - cmake_minimum_required(VERSION 3.14) project(qml_picturetransfer LANGUAGES CXX) diff --git a/examples/bluetooth/pingpong/CMakeLists.txt b/examples/bluetooth/pingpong/CMakeLists.txt index f874d555..c771d16d 100644 --- a/examples/bluetooth/pingpong/CMakeLists.txt +++ b/examples/bluetooth/pingpong/CMakeLists.txt @@ -1,5 +1,3 @@ -# Generated from pingpong.pro. - cmake_minimum_required(VERSION 3.14) project(pingpong LANGUAGES CXX) diff --git a/examples/bluetooth/scanner/CMakeLists.txt b/examples/bluetooth/scanner/CMakeLists.txt index 2a624e37..c27b5968 100644 --- a/examples/bluetooth/scanner/CMakeLists.txt +++ b/examples/bluetooth/scanner/CMakeLists.txt @@ -1,5 +1,3 @@ -# Generated from scanner.pro. - cmake_minimum_required(VERSION 3.14) project(qml_scanner LANGUAGES CXX) diff --git a/examples/nfc/CMakeLists.txt b/examples/nfc/CMakeLists.txt index a4e34262..f8fd3ffb 100644 --- a/examples/nfc/CMakeLists.txt +++ b/examples/nfc/CMakeLists.txt @@ -1,5 +1,3 @@ -# Generated from nfc.pro. - if(TARGET Qt::Widgets) add_subdirectory(annotatedurl) add_subdirectory(ndefeditor) diff --git a/examples/nfc/annotatedurl/CMakeLists.txt b/examples/nfc/annotatedurl/CMakeLists.txt index 58f046e7..6a40dc85 100644 --- a/examples/nfc/annotatedurl/CMakeLists.txt +++ b/examples/nfc/annotatedurl/CMakeLists.txt @@ -1,5 +1,3 @@ -# Generated from annotatedurl.pro. - cmake_minimum_required(VERSION 3.14) project(annotatedurl LANGUAGES CXX) diff --git a/examples/nfc/ndefeditor/CMakeLists.txt b/examples/nfc/ndefeditor/CMakeLists.txt index a6eeef2d..95b9e0c6 100644 --- a/examples/nfc/ndefeditor/CMakeLists.txt +++ b/examples/nfc/ndefeditor/CMakeLists.txt @@ -1,5 +1,3 @@ -# Generated from ndefeditor.pro. - cmake_minimum_required(VERSION 3.14) project(ndefeditor LANGUAGES CXX) diff --git a/qtconnectivity.pro b/qtconnectivity.pro deleted file mode 100644 index 6e590928..00000000 --- a/qtconnectivity.pro +++ /dev/null @@ -1,5 +0,0 @@ -requires(qtHaveModule(network)) -requires(!android|qtHaveModule(androidextras)) - - -load(qt_parts) diff --git a/src/.prev_CMakeLists.txt b/src/.prev_CMakeLists.txt deleted file mode 100644 index 6d250b72..00000000 --- a/src/.prev_CMakeLists.txt +++ /dev/null @@ -1,10 +0,0 @@ -# Generated from src.pro. - -add_subdirectory(bluetooth) -add_subdirectory(nfc) -if(ANDROID) - add_subdirectory(android) -endif() -if(TARGET Qt::Quick) - add_subdirectory(imports) -endif() diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index c8a1bafd..62062ac2 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1,5 +1,3 @@ -# Generated from src.pro. - add_subdirectory(bluetooth) add_subdirectory(nfc) if(ANDROID) @@ -9,9 +7,6 @@ if(TARGET Qt::Quick) add_subdirectory(imports) endif() -# special case begin if(QT_FEATURE_bluez) add_subdirectory(tools/sdpscanner) endif() -# special case end - diff --git a/src/android/CMakeLists.txt b/src/android/CMakeLists.txt index aa82c9bc..499af7d9 100644 --- a/src/android/CMakeLists.txt +++ b/src/android/CMakeLists.txt @@ -1,5 +1,3 @@ -# Generated from android.pro. - if(TARGET Qt::Bluetooth) add_subdirectory(bluetooth) endif() diff --git a/src/android/android.pro b/src/android/android.pro deleted file mode 100644 index f8f5c05e..00000000 --- a/src/android/android.pro +++ /dev/null @@ -1,3 +0,0 @@ -TEMPLATE = subdirs -qtHaveModule(bluetooth): SUBDIRS += bluetooth -qtHaveModule(nfc): SUBDIRS += nfc diff --git a/src/android/bluetooth/.prev_CMakeLists.txt b/src/android/bluetooth/.prev_CMakeLists.txt deleted file mode 100644 index 3d77e231..00000000 --- a/src/android/bluetooth/.prev_CMakeLists.txt +++ /dev/null @@ -1,23 +0,0 @@ -# Generated from bluetooth.pro. - -qt_get_android_sdk_jar_for_api("android-21" android_sdk) - -set(java_sources - src/org/qtproject/qt/android/bluetooth/QtBluetoothBroadcastReceiver.java - src/org/qtproject/qt/android/bluetooth/QtBluetoothInputStreamThread.java - src/org/qtproject/qt/android/bluetooth/QtBluetoothLE.java - src/org/qtproject/qt/android/bluetooth/QtBluetoothLEServer.java - src/org/qtproject/qt/android/bluetooth/QtBluetoothSocketServer.java -) - -qt_internal_add_jar(QtAndroidBluetooth - INCLUDE_JARS ${android_sdk} - SOURCES ${java_sources} - OUTPUT_DIR "${QT_BUILD_DIR}/jar" -) - -install_jar(QtAndroidBluetooth - DESTINATION jar - COMPONENT Devel -) - diff --git a/src/android/bluetooth/CMakeLists.txt b/src/android/bluetooth/CMakeLists.txt index 46e18586..a3ff6724 100644 --- a/src/android/bluetooth/CMakeLists.txt +++ b/src/android/bluetooth/CMakeLists.txt @@ -1,5 +1,3 @@ -# Generated from bluetooth.pro. - qt_get_android_sdk_jar_for_api("android-21" android_sdk) set(java_sources @@ -10,13 +8,13 @@ set(java_sources src/org/qtproject/qt/android/bluetooth/QtBluetoothSocketServer.java ) -qt_internal_add_jar(Qt${QtConnectivity_VERSION_MAJOR}AndroidBluetooth # special case +qt_internal_add_jar(Qt${QtConnectivity_VERSION_MAJOR}AndroidBluetooth INCLUDE_JARS ${android_sdk} SOURCES ${java_sources} OUTPUT_DIR "${QT_BUILD_DIR}/jar" ) -install_jar(Qt${QtConnectivity_VERSION_MAJOR}AndroidBluetooth # special case +install_jar(Qt${QtConnectivity_VERSION_MAJOR}AndroidBluetooth DESTINATION jar COMPONENT Devel ) diff --git a/src/android/bluetooth/bluetooth.pro b/src/android/bluetooth/bluetooth.pro deleted file mode 100644 index 27780e18..00000000 --- a/src/android/bluetooth/bluetooth.pro +++ /dev/null @@ -1,19 +0,0 @@ -TARGET = Qt$${QT_MAJOR_VERSION}AndroidBluetooth - -CONFIG += java -DESTDIR = $$[QT_INSTALL_PREFIX/get]/jar -API_VERSION = android-21 - -PATHPREFIX = $$PWD/src/org/qtproject/qt/android/bluetooth - -JAVACLASSPATH += $$PWD/src/ -JAVASOURCES += \ - $$PATHPREFIX/QtBluetoothBroadcastReceiver.java \ - $$PATHPREFIX/QtBluetoothSocketServer.java \ - $$PATHPREFIX/QtBluetoothInputStreamThread.java \ - $$PATHPREFIX/QtBluetoothLE.java \ - $$PATHPREFIX/QtBluetoothLEServer.java - -# install -target.path = $$[QT_INSTALL_PREFIX]/jar -INSTALLS += target diff --git a/src/android/nfc/.prev_CMakeLists.txt b/src/android/nfc/.prev_CMakeLists.txt deleted file mode 100644 index bac4363b..00000000 --- a/src/android/nfc/.prev_CMakeLists.txt +++ /dev/null @@ -1,20 +0,0 @@ -# Generated from nfc.pro. - -qt_get_android_sdk_jar_for_api("android-18" android_sdk) - -set(java_sources - src/org/qtproject/qt/android/nfc/QtNfc.java - src/org/qtproject/qt/android/nfc/QtNfcBroadcastReceiver.java -) - -qt_internal_add_jar(QtAndroidNfc - INCLUDE_JARS ${android_sdk} - SOURCES ${java_sources} - OUTPUT_DIR "${QT_BUILD_DIR}/jar" -) - -install_jar(QtAndroidNfc - DESTINATION jar - COMPONENT Devel -) - diff --git a/src/android/nfc/CMakeLists.txt b/src/android/nfc/CMakeLists.txt index ac4bd166..fb63f1fc 100644 --- a/src/android/nfc/CMakeLists.txt +++ b/src/android/nfc/CMakeLists.txt @@ -1,5 +1,3 @@ -# Generated from nfc.pro. - qt_get_android_sdk_jar_for_api("android-18" android_sdk) set(java_sources @@ -7,13 +5,13 @@ set(java_sources src/org/qtproject/qt/android/nfc/QtNfcBroadcastReceiver.java ) -qt_internal_add_jar(Qt${QtConnectivity_VERSION_MAJOR}AndroidNfc # special case +qt_internal_add_jar(Qt${QtConnectivity_VERSION_MAJOR}AndroidNfc INCLUDE_JARS ${android_sdk} SOURCES ${java_sources} OUTPUT_DIR "${QT_BUILD_DIR}/jar" ) -install_jar(Qt${QtConnectivity_VERSION_MAJOR}AndroidNfc # special case +install_jar(Qt${QtConnectivity_VERSION_MAJOR}AndroidNfc DESTINATION jar COMPONENT Devel ) diff --git a/src/android/nfc/nfc.pro b/src/android/nfc/nfc.pro deleted file mode 100644 index a8a2fd0b..00000000 --- a/src/android/nfc/nfc.pro +++ /dev/null @@ -1,16 +0,0 @@ -TARGET = Qt$${QT_MAJOR_VERSION}AndroidNfc - -CONFIG += java -DESTDIR = $$[QT_INSTALL_PREFIX/get]/jar -API_VERSION = android-18 - -PATHPREFIX = $$PWD/src/org/qtproject/qt/android/nfc - -JAVACLASSPATH += $$PWD/src/ -JAVASOURCES += \ - $$PWD/src/org/qtproject/qt/android/nfc/QtNfc.java \ - $$PWD/src/org/qtproject/qt/android/nfc/QtNfcBroadcastReceiver.java \ - -# install -target.path = $$[QT_INSTALL_PREFIX]/jar -INSTALLS += target diff --git a/src/bluetooth/.prev_CMakeLists.txt b/src/bluetooth/.prev_CMakeLists.txt deleted file mode 100644 index f0280711..00000000 --- a/src/bluetooth/.prev_CMakeLists.txt +++ /dev/null @@ -1,298 +0,0 @@ -# Generated from bluetooth.pro. - -##################################################################### -## Bluetooth Module: -##################################################################### - -qt_internal_add_module(Bluetooth - SOURCES - lecmaccalculator_p.h - qbluetooth.cpp qbluetooth.h - qbluetoothaddress.cpp qbluetoothaddress.h qbluetoothaddress_p.h - qbluetoothdevicediscoveryagent.cpp qbluetoothdevicediscoveryagent.h qbluetoothdevicediscoveryagent_p.h - qbluetoothdeviceinfo.cpp qbluetoothdeviceinfo.h qbluetoothdeviceinfo_p.h - qbluetoothhostinfo.cpp qbluetoothhostinfo.h qbluetoothhostinfo_p.h - qbluetoothlocaldevice.cpp qbluetoothlocaldevice.h qbluetoothlocaldevice_p.h - qbluetoothserver.cpp qbluetoothserver.h qbluetoothserver_p.h - qbluetoothservicediscoveryagent.cpp qbluetoothservicediscoveryagent.h qbluetoothservicediscoveryagent_p.h - qbluetoothserviceinfo.cpp qbluetoothserviceinfo.h qbluetoothserviceinfo_p.h - qbluetoothsocket.cpp qbluetoothsocket.h - qbluetoothsocketbase.cpp qbluetoothsocketbase_p.h - qbluetoothtransfermanager.cpp qbluetoothtransfermanager.h - qbluetoothtransferreply.cpp qbluetoothtransferreply.h qbluetoothtransferreply_p.h - qbluetoothtransferrequest.cpp qbluetoothtransferrequest.h qbluetoothtransferrequest_p.h - qbluetoothuuid.cpp qbluetoothuuid.h - qleadvertiser_p.h - qlowenergyadvertisingdata.cpp qlowenergyadvertisingdata.h - qlowenergyadvertisingparameters.cpp qlowenergyadvertisingparameters.h - qlowenergycharacteristic.cpp qlowenergycharacteristic.h - qlowenergycharacteristicdata.cpp qlowenergycharacteristicdata.h - qlowenergyconnectionparameters.cpp qlowenergyconnectionparameters.h - qlowenergycontroller.cpp qlowenergycontroller.h - qlowenergycontrollerbase.cpp qlowenergycontrollerbase_p.h - qlowenergydescriptor.cpp qlowenergydescriptor.h - qlowenergydescriptordata.cpp qlowenergydescriptordata.h - qlowenergyservice.cpp qlowenergyservice.h - qlowenergyservicedata.cpp qlowenergyservicedata.h - qlowenergyserviceprivate.cpp qlowenergyserviceprivate_p.h - qprivatelinearbuffer_p.h - qtbluetoothglobal.h qtbluetoothglobal_p.h - DEFINES - QT_NO_FOREACH - LIBRARIES - Qt::CorePrivate - Qt::NetworkPrivate - PUBLIC_LIBRARIES - Qt::Core - Qt::Network - PRIVATE_MODULE_INTERFACE - Qt::CorePrivate - Qt::NetworkPrivate -) - -#### Keys ignored in scope 1:.:.:bluetooth.pro:<TRUE>: -# OTHER_FILES = "doc/src/*.qdoc" - -## Scopes: -##################################################################### - -#### Keys ignored in scope 2:.:.:bluetooth.pro:WIN32: -# WINDOWS_SDK_VERSION = "$$member($$list $$split WINDOWS_SDK_VERSION_STRING, . , 2)" -# WINDOWS_SDK_VERSION_STRING = "$$(WindowsSDKVersion)" - -qt_internal_extend_target(Bluetooth CONDITION QT_FEATURE_bluez - SOURCES - bluez/adapter.cpp bluez/adapter_p.h - bluez/adapter1_bluez5.cpp bluez/adapter1_bluez5_p.h - bluez/agent.cpp bluez/agent_p.h - bluez/battery1.cpp bluez/battery1_p.h - bluez/bluetoothmanagement.cpp bluez/bluetoothmanagement_p.h - bluez/bluez5_helper.cpp bluez/bluez5_helper_p.h - bluez/bluez_data_p.h - bluez/device.cpp bluez/device_p.h - bluez/device1_bluez5.cpp bluez/device1_bluez5_p.h - bluez/gattchar1.cpp bluez/gattchar1_p.h - bluez/gattdesc1.cpp bluez/gattdesc1_p.h - bluez/gattservice1.cpp bluez/gattservice1_p.h - bluez/hcimanager.cpp bluez/hcimanager_p.h - bluez/manager.cpp bluez/manager_p.h - bluez/obex_agent.cpp bluez/obex_agent_p.h - bluez/obex_client.cpp bluez/obex_client_p.h - bluez/obex_client1_bluez5.cpp bluez/obex_client1_bluez5_p.h - bluez/obex_manager.cpp bluez/obex_manager_p.h - bluez/obex_objectpush1_bluez5.cpp bluez/obex_objectpush1_bluez5_p.h - bluez/obex_transfer.cpp bluez/obex_transfer_p.h - bluez/obex_transfer1_bluez5.cpp bluez/obex_transfer1_bluez5_p.h - bluez/objectmanager.cpp bluez/objectmanager_p.h - bluez/profile1.cpp bluez/profile1_p.h - bluez/profile1context.cpp bluez/profile1context_p.h - bluez/profilemanager1.cpp bluez/profilemanager1_p.h - bluez/properties.cpp bluez/properties_p.h - bluez/remotedevicemanager.cpp bluez/remotedevicemanager_p.h - bluez/service.cpp bluez/service_p.h - bluez/servicemap.cpp bluez/servicemap_p.h - qbluetoothdevicediscoveryagent_bluez.cpp - qbluetoothlocaldevice_bluez.cpp - qbluetoothserver_bluez.cpp - qbluetoothservicediscoveryagent_bluez.cpp - qbluetoothserviceinfo_bluez.cpp - qbluetoothsocket_bluez.cpp qbluetoothsocket_bluez_p.h - qbluetoothsocket_bluezdbus.cpp qbluetoothsocket_bluezdbus_p.h - qbluetoothtransferreply_bluez.cpp qbluetoothtransferreply_bluez_p.h - LIBRARIES - Qt::Concurrent - Qt::DBus - PRIVATE_MODULE_INTERFACE - Qt::DBus -) - -qt_internal_extend_target(Bluetooth CONDITION QT_FEATURE_bluez AND QT_FEATURE_bluez_le - SOURCES - lecmaccalculator.cpp - qleadvertiser_bluez.cpp - qlowenergycontroller_bluez.cpp qlowenergycontroller_bluez_p.h - qlowenergycontroller_bluezdbus.cpp qlowenergycontroller_bluezdbus_p.h -) - -qt_internal_extend_target(Bluetooth CONDITION QT_FEATURE_bluez AND QT_FEATURE_bluez_le AND QT_FEATURE_linux_crypto_api - DEFINES - CONFIG_LINUX_CRYPTO_API -) - -qt_internal_extend_target(Bluetooth CONDITION QT_FEATURE_bluez AND NOT QT_FEATURE_bluez_le - SOURCES - dummy/dummy_helper.cpp dummy/dummy_helper_p.h - qlowenergycontroller_dummy.cpp qlowenergycontroller_dummy_p.h - DEFINES - QT_BLUEZ_NO_BTLE -) - -if(ANDROID AND (ANDROID AND NOT ANDROID_EMBEDDED)) - set_property(TARGET Bluetooth APPEND PROPERTY QT_ANDROID_BUNDLED_JAR_DEPENDENCIES - jar/QtAndroidBluetooth.jar:org.qtproject.qt.android.bluetooth.QtBluetoothBroadcastReceiver - ) - set_property(TARGET Bluetooth APPEND PROPERTY QT_ANDROID_PERMISSIONS - android.permission.ACCESS_COARSE_LOCATION android.permission.ACCESS_FINE_LOCATION android.permission.BLUETOOTH android.permission.BLUETOOTH_ADMIN - ) -endif() - -qt_internal_extend_target(Bluetooth CONDITION ANDROID AND NOT ANDROID_EMBEDDED AND NOT QT_FEATURE_bluez - SOURCES - android/androidbroadcastreceiver.cpp android/androidbroadcastreceiver_p.h - android/devicediscoverybroadcastreceiver.cpp android/devicediscoverybroadcastreceiver_p.h - android/inputstreamthread.cpp android/inputstreamthread_p.h - android/jni_android.cpp android/jni_android_p.h - android/localdevicebroadcastreceiver.cpp android/localdevicebroadcastreceiver_p.h - android/lowenergynotificationhub.cpp android/lowenergynotificationhub_p.h - android/serveracceptancethread.cpp android/serveracceptancethread_p.h - android/servicediscoverybroadcastreceiver.cpp android/servicediscoverybroadcastreceiver_p.h - qbluetoothdevicediscoveryagent_android.cpp - qbluetoothlocaldevice_android.cpp - qbluetoothserver_android.cpp - qbluetoothservicediscoveryagent_android.cpp - qbluetoothserviceinfo_android.cpp - qbluetoothsocket_android.cpp qbluetoothsocket_android_p.h - qlowenergycontroller_android.cpp qlowenergycontroller_android_p.h - DEFINES - QT_ANDROID_BLUETOOTH - LIBRARIES - Qt::AndroidExtras - Qt::CorePrivate - PRIVATE_MODULE_INTERFACE - Qt::AndroidExtras - Qt::CorePrivate -) - -qt_internal_extend_target(Bluetooth CONDITION MACOS AND NOT QT_FEATURE_bluez AND (ANDROID_EMBEDDED OR NOT ANDROID) - SOURCES - darwin/btcentralmanager.mm darwin/btcentralmanager_p.h - darwin/btconnectionmonitor.mm darwin/btconnectionmonitor_p.h - darwin/btdelegates.cpp darwin/btdelegates_p.h - darwin/btdeviceinquiry.mm darwin/btdeviceinquiry_p.h - darwin/btdevicepair.mm darwin/btdevicepair_p.h - darwin/btgcdtimer.mm darwin/btgcdtimer_p.h - darwin/btl2capchannel.mm darwin/btl2capchannel_p.h - darwin/btledeviceinquiry.mm darwin/btledeviceinquiry_p.h - darwin/btnotifier.cpp darwin/btnotifier_p.h - darwin/btobexsession.mm darwin/btobexsession_p.h - darwin/btperipheralmanager.mm darwin/btperipheralmanager_p.h - darwin/btraii.mm darwin/btraii_p.h - darwin/btrfcommchannel.mm darwin/btrfcommchannel_p.h - darwin/btsdpinquiry.mm darwin/btsdpinquiry_p.h - darwin/btservicerecord.mm darwin/btservicerecord_p.h - darwin/btsocketlistener.mm darwin/btsocketlistener_p.h - darwin/btutility.mm darwin/btutility_p.h - darwin/uistrings.cpp darwin/uistrings_p.h - qbluetoothdevicediscoveryagent_darwin.mm - qbluetoothlocaldevice_macos.mm - qbluetoothserver_macos.mm - qbluetoothservicediscoveryagent_macos.mm - qbluetoothserviceinfo_macos.mm - qbluetoothsocket_macos.mm qbluetoothsocket_macos_p.h - qbluetoothtransferreply_macos.mm qbluetoothtransferreply_macos_p.h - qlowenergycontroller_darwin.mm qlowenergycontroller_darwin_p.h - DEFINES - QT_OSX_BLUETOOTH - LIBRARIES - ${FWFoundation} - ${FWIOBluetooth} - Qt::Concurrent -) - -qt_internal_extend_target(Bluetooth CONDITION NOT MACOS AND NOT QT_FEATURE_bluez AND (IOS OR TVOS) AND (ANDROID_EMBEDDED OR NOT ANDROID) - SOURCES - darwin/btcentralmanager.mm darwin/btcentralmanager_p.h - darwin/btdelegates.cpp darwin/btdelegates_p.h - darwin/btgcdtimer.mm darwin/btgcdtimer_p.h - darwin/btledeviceinquiry.mm darwin/btledeviceinquiry_p.h - darwin/btnotifier.cpp darwin/btnotifier_p.h - darwin/btraii.mm darwin/btraii_p.h - darwin/btutility.mm darwin/btutility_p.h - darwin/uistrings.cpp darwin/uistrings_p.h - qbluetoothdevicediscoveryagent_darwin.mm - qbluetoothlocaldevice_p.cpp - qbluetoothserver_p.cpp - qbluetoothservicediscoveryagent_p.cpp - qbluetoothserviceinfo_p.cpp - qbluetoothsocket_dummy.cpp qbluetoothsocket_dummy_p.h - qlowenergycontroller_darwin.mm qlowenergycontroller_darwin_p.h - DEFINES - QT_IOS_BLUETOOTH - LIBRARIES - ${FWCoreBluetooth} - ${FWFoundation} -) - -qt_internal_extend_target(Bluetooth CONDITION IOS AND NOT MACOS AND NOT QT_FEATURE_bluez AND (ANDROID_EMBEDDED OR NOT ANDROID) - SOURCES - darwin/btperipheralmanager.mm darwin/btperipheralmanager_p.h -) - -qt_internal_extend_target(Bluetooth CONDITION QT_FEATURE_winrt_bt AND NOT IOS AND NOT MACOS AND NOT QT_FEATURE_bluez AND NOT TVOS AND (ANDROID_EMBEDDED OR NOT ANDROID) - SOURCES - qbluetoothdevicediscoveryagent_winrt.cpp - qbluetoothlocaldevice_winrt.cpp - qbluetoothserver_winrt.cpp - qbluetoothservicediscoveryagent_winrt.cpp - qbluetoothserviceinfo_winrt.cpp - qbluetoothsocket_winrt.cpp qbluetoothsocket_winrt_p.h - qbluetoothutils_winrt.cpp qbluetoothutils_winrt_p.h - qlowenergycontroller_winrt.cpp qlowenergycontroller_winrt_p.h - DEFINES - QT_WINRT_BLUETOOTH - LIBRARIES - Qt::CorePrivate - PUBLIC_LIBRARIES - Qt::Core - runtimeobject.lib - user32.lib - PRIVATE_MODULE_INTERFACE - Qt::CorePrivate -) - -qt_internal_extend_target(Bluetooth CONDITION QT_FEATURE_winrt_bt AND QT_FEATURE_winrt_btle_no_pairing AND NOT IOS AND NOT MACOS AND NOT QT_FEATURE_bluez AND NOT TVOS AND (ANDROID_EMBEDDED OR NOT ANDROID) - SOURCES - qlowenergycontroller_winrt_new.cpp qlowenergycontroller_winrt_new_p.h -) - -qt_internal_extend_target(Bluetooth CONDITION QT_FEATURE_winrt_bt AND QT_WINDOWS_SDK_VERSION STRLESS 14393 AND NOT IOS AND NOT MACOS AND NOT QT_FEATURE_bluez AND NOT TVOS AND (ANDROID_EMBEDDED OR NOT ANDROID) - DEFINES - QT_UCRTVERSION= - QT_WINRT_LIMITED_SERVICEDISCOVERY -) - -qt_internal_extend_target(Bluetooth CONDITION WIN32 AND NOT QT_FEATURE_bluez AND NOT QT_FEATURE_winrt_bt AND (ANDROID_EMBEDDED OR NOT ANDROID) - SOURCES - qbluetoothdevicediscoveryagent_win.cpp - qbluetoothlocaldevice_win.cpp - qbluetoothserver_win.cpp - qbluetoothservicediscoveryagent_win.cpp - qbluetoothserviceinfo_win.cpp - qbluetoothsocket_win.cpp qbluetoothsocket_win_p.h - qlowenergycontroller_win.cpp qlowenergycontroller_win_p.h - windows/qwinlowenergybluetooth_p.h - DEFINES - QT_WIN_BLUETOOTH - LIBRARIES - Qt::Concurrent - PUBLIC_LIBRARIES - bthprops - setupapi - ws2_32 -) - -qt_internal_extend_target(Bluetooth CONDITION UNIX AND NOT IOS AND NOT MACOS AND NOT QT_FEATURE_bluez AND NOT QT_FEATURE_winrt_bt AND NOT TVOS AND (ANDROID_EMBEDDED OR NOT ANDROID) - SOURCES - dummy/dummy_helper.cpp dummy/dummy_helper_p.h - qbluetoothdevicediscoveryagent_p.cpp - qbluetoothlocaldevice_p.cpp - qbluetoothserver_p.cpp - qbluetoothservicediscoveryagent_p.cpp - qbluetoothserviceinfo_p.cpp - qbluetoothsocket_dummy.cpp qbluetoothsocket_dummy_p.h - qlowenergycontroller_dummy.cpp qlowenergycontroller_dummy_p.h -) -qt_internal_add_docs(Bluetooth - doc/qtbluetooth.qdocconf -) - diff --git a/src/bluetooth/CMakeLists.txt b/src/bluetooth/CMakeLists.txt index 034375c9..88a26904 100644 --- a/src/bluetooth/CMakeLists.txt +++ b/src/bluetooth/CMakeLists.txt @@ -1,5 +1,3 @@ -# Generated from bluetooth.pro. - ##################################################################### ## Bluetooth Module: ##################################################################### @@ -60,7 +58,6 @@ qt_internal_add_module(Bluetooth # WINDOWS_SDK_VERSION = "$$member($$list $$split WINDOWS_SDK_VERSION_STRING, . , 2)" # WINDOWS_SDK_VERSION_STRING = "$$(WindowsSDKVersion)" -# special case begin if (WIN32) if (DEFINED CMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION) set (WINDOWS_SDK_VERSION ${CMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION}) @@ -82,7 +79,6 @@ extend_target(Bluetooth CONDITION WIN32 AND WINDOWS_SDK_VERSION_PATCH LESS 14393 DEFINES QT_WINRT_LIMITED_SERVICEDISCOVERY ) -# special case end qt_internal_extend_target(Bluetooth CONDITION QT_FEATURE_bluez SOURCES @@ -125,8 +121,8 @@ qt_internal_extend_target(Bluetooth CONDITION QT_FEATURE_bluez qbluetoothtransferreply_bluez.cpp qbluetoothtransferreply_bluez_p.h LIBRARIES Qt::Concurrent - PUBLIC_LIBRARIES # special case for Linux QEMU (gcc-armv7) on Linux Ubuntu_20_04 (gcc-x86_64) - Qt::DBus # special case + PUBLIC_LIBRARIES # for Linux QEMU (gcc-armv7) on Linux Ubuntu_20_04 (gcc-x86_64) + Qt::DBus ) qt_internal_extend_target(Bluetooth CONDITION QT_FEATURE_bluez AND QT_FEATURE_bluez_le @@ -152,7 +148,7 @@ qt_internal_extend_target(Bluetooth CONDITION QT_FEATURE_bluez AND NOT QT_FEATUR if(ANDROID AND (ANDROID AND NOT ANDROID_EMBEDDED)) set_property(TARGET Bluetooth APPEND PROPERTY QT_ANDROID_BUNDLED_JAR_DEPENDENCIES - jar/Qt${QtConnectivity_VERSION_MAJOR}AndroidBluetooth.jar:org.qtproject.qt.android.bluetooth.QtBluetoothBroadcastReceiver # special case + jar/Qt${QtConnectivity_VERSION_MAJOR}AndroidBluetooth.jar:org.qtproject.qt.android.bluetooth.QtBluetoothBroadcastReceiver ) set_property(TARGET Bluetooth APPEND PROPERTY QT_ANDROID_PERMISSIONS android.permission.ACCESS_COARSE_LOCATION android.permission.ACCESS_FINE_LOCATION android.permission.BLUETOOTH android.permission.BLUETOOTH_ADMIN @@ -278,14 +274,6 @@ qt_internal_extend_target(Bluetooth CONDITION QT_FEATURE_winrt_bt AND QT_FEATURE qlowenergycontroller_winrt_new.cpp qlowenergycontroller_winrt_new_p.h ) -# special case begin -# qt_extend_target(Bluetooth CONDITION QT_FEATURE_winrt_bt AND QT_WINDOWS_SDK_VERSION STRLESS 14393 AND NOT IOS AND NOT MACOS AND NOT QT_FEATURE_bluez AND NOT TVOS AND (ANDROID_EMBEDDED OR NOT ANDROID) -# DEFINES -# QT_UCRTVERSION= -# QT_WINRT_LIMITED_SERVICEDISCOVERY -# ) -# special case end - qt_internal_extend_target(Bluetooth CONDITION WIN32 AND NOT QT_FEATURE_bluez AND NOT QT_FEATURE_winrt_bt AND (ANDROID_EMBEDDED OR NOT ANDROID) SOURCES qbluetoothdevicediscoveryagent_win.cpp diff --git a/src/bluetooth/bluetooth.pro b/src/bluetooth/bluetooth.pro deleted file mode 100644 index 52f2b087..00000000 --- a/src/bluetooth/bluetooth.pro +++ /dev/null @@ -1,257 +0,0 @@ -TARGET = QtBluetooth -QT = core core-private network network-private -DEFINES += QT_NO_FOREACH - -QMAKE_DOCS = $$PWD/doc/qtbluetooth.qdocconf -OTHER_FILES += doc/src/*.qdoc # show .qdoc files in Qt Creator - -HEADERS += \ - qtbluetoothglobal.h \ - qbluetoothaddress.h\ - qbluetoothhostinfo.h \ - qbluetoothuuid.h\ - qbluetoothdeviceinfo.h\ - qbluetoothserviceinfo.h\ - qbluetoothdevicediscoveryagent.h\ - qbluetoothservicediscoveryagent.h\ - qbluetoothsocket.h\ - qbluetoothserver.h \ - qbluetooth.h \ - qbluetoothlocaldevice.h \ - 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 \ - qtbluetoothglobal_p.h \ - qbluetoothaddress_p.h\ - qbluetoothhostinfo_p.h \ - qbluetoothdeviceinfo_p.h\ - qbluetoothserviceinfo_p.h\ - qbluetoothdevicediscoveryagent_p.h\ - qbluetoothservicediscoveryagent_p.h\ - qbluetoothsocketbase_p.h \ - qbluetoothserver_p.h\ - qbluetoothtransferreply_p.h \ - qbluetoothtransferrequest_p.h \ - qprivatelinearbuffer_p.h \ - qbluetoothlocaldevice_p.h \ - qlowenergycontrollerbase_p.h \ - qlowenergyserviceprivate_p.h \ - qleadvertiser_p.h \ - lecmaccalculator_p.h - -SOURCES += \ - qbluetoothaddress.cpp\ - qbluetoothhostinfo.cpp \ - qbluetoothuuid.cpp\ - qbluetoothdeviceinfo.cpp\ - qbluetoothserviceinfo.cpp\ - qbluetoothdevicediscoveryagent.cpp\ - qbluetoothservicediscoveryagent.cpp\ - qbluetoothsocket.cpp\ - qbluetoothsocketbase.cpp \ - qbluetoothserver.cpp \ - qbluetoothlocaldevice.cpp \ - qbluetooth.cpp \ - 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 \ - qlowenergycontrollerbase.cpp \ - qlowenergyserviceprivate.cpp - -win32 { - WINDOWS_SDK_VERSION_STRING = $$(WindowsSDKVersion) - WINDOWS_SDK_VERSION = $$member($$list($$split(WINDOWS_SDK_VERSION_STRING, .)), 2) -} - -qtConfig(bluez) { - QT_PRIVATE = concurrent - QT_FOR_PRIVATE += dbus - - include(bluez/bluez.pri) - - HEADERS += \ - qbluetoothtransferreply_bluez_p.h \ - qbluetoothsocket_bluez_p.h \ - qbluetoothsocket_bluezdbus_p.h - - SOURCES += \ - qbluetoothserviceinfo_bluez.cpp \ - qbluetoothdevicediscoveryagent_bluez.cpp\ - qbluetoothservicediscoveryagent_bluez.cpp \ - qbluetoothsocket_bluez.cpp \ - qbluetoothsocket_bluezdbus.cpp \ - qbluetoothserver_bluez.cpp \ - qbluetoothlocaldevice_bluez.cpp \ - qbluetoothtransferreply_bluez.cpp - - - # old versions of Bluez do not have the required BTLE symbols - qtConfig(bluez_le) { - SOURCES += \ - qleadvertiser_bluez.cpp \ - qlowenergycontroller_bluez.cpp \ - lecmaccalculator.cpp \ - qlowenergycontroller_bluezdbus.cpp - - HEADERS += qlowenergycontroller_bluezdbus_p.h \ - qlowenergycontroller_bluez_p.h - - qtConfig(linux_crypto_api): DEFINES += CONFIG_LINUX_CRYPTO_API - } else { - DEFINES += QT_BLUEZ_NO_BTLE - include(dummy/dummy.pri) - SOURCES += \ - qlowenergycontroller_dummy.cpp - - HEADERS += qlowenergycontroller_dummy_p.h - } - -} else:android:!android-embedded { - include(android/android.pri) - DEFINES += QT_ANDROID_BLUETOOTH - QT_FOR_PRIVATE += core-private androidextras - - ANDROID_PERMISSIONS = \ - android.permission.BLUETOOTH \ - android.permission.BLUETOOTH_ADMIN \ - android.permission.ACCESS_FINE_LOCATION \ - android.permission.ACCESS_COARSE_LOCATION # since Android 6.0 (API lvl 23) - ANDROID_BUNDLED_JAR_DEPENDENCIES = \ - jar/Qt$${QT_MAJOR_VERSION}AndroidBluetooth.jar:org.qtproject.qt.android.bluetooth.QtBluetoothBroadcastReceiver - - SOURCES += \ - qbluetoothdevicediscoveryagent_android.cpp \ - qbluetoothlocaldevice_android.cpp \ - qbluetoothserviceinfo_android.cpp \ - qbluetoothservicediscoveryagent_android.cpp \ - qbluetoothsocket_android.cpp \ - qbluetoothserver_android.cpp \ - qlowenergycontroller_android.cpp - - HEADERS += qlowenergycontroller_android_p.h \ - qbluetoothsocket_android_p.h -} else:osx { - QT_PRIVATE = concurrent - DEFINES += QT_OSX_BLUETOOTH - LIBS_PRIVATE += -framework Foundation -framework IOBluetooth - - include(darwin/darwinbt.pri) - OBJECTIVE_SOURCES += \ - qbluetoothlocaldevice_macos.mm \ - qbluetoothdevicediscoveryagent_darwin.mm \ - qbluetoothserviceinfo_macos.mm \ - qbluetoothservicediscoveryagent_macos.mm \ - qbluetoothsocket_macos.mm \ - qbluetoothserver_macos.mm \ - qbluetoothtransferreply_macos.mm \ - qlowenergycontroller_darwin.mm - - HEADERS += qbluetoothsocket_macos_p.h \ - qbluetoothtransferreply_macos_p.h \ - qlowenergycontroller_darwin_p.h -} else:ios|tvos { - DEFINES += QT_IOS_BLUETOOTH - LIBS_PRIVATE += -framework Foundation -framework CoreBluetooth - - OBJECTIVE_SOURCES += \ - qbluetoothdevicediscoveryagent_darwin.mm \ - qlowenergycontroller_darwin.mm - - HEADERS += \ - qlowenergycontroller_darwin_p.h \ - qbluetoothsocket_dummy_p.h - - include(darwin/darwinbt.pri) - SOURCES += \ - qbluetoothlocaldevice_p.cpp \ - qbluetoothserviceinfo_p.cpp \ - qbluetoothservicediscoveryagent_p.cpp \ - qbluetoothsocket_dummy.cpp \ - qbluetoothserver_p.cpp -} else: qtConfig(winrt_bt) { - DEFINES += QT_WINRT_BLUETOOTH - LIBS += runtimeobject.lib user32.lib - - QT += core-private - - SOURCES += \ - qbluetoothdevicediscoveryagent_winrt.cpp \ - qbluetoothlocaldevice_winrt.cpp \ - qbluetoothserver_winrt.cpp \ - qbluetoothservicediscoveryagent_winrt.cpp \ - qbluetoothserviceinfo_winrt.cpp \ - qbluetoothsocket_winrt.cpp \ - qbluetoothutils_winrt.cpp \ - qlowenergycontroller_winrt.cpp - - HEADERS += qlowenergycontroller_winrt_p.h \ - qbluetoothsocket_winrt_p.h \ - qbluetoothutils_winrt_p.h - - qtConfig(winrt_btle_no_pairing) { - SOURCES += qlowenergycontroller_winrt_new.cpp - HEADERS += qlowenergycontroller_winrt_new_p.h - } - - lessThan(WINDOWS_SDK_VERSION, 14393) { - DEFINES += QT_WINRT_LIMITED_SERVICEDISCOVERY - DEFINES += QT_UCRTVERSION=$$WINDOWS_SDK_VERSION - } -} else:win32 { - QT_PRIVATE = concurrent - DEFINES += QT_WIN_BLUETOOTH - LIBS += -lbthprops -lws2_32 -lsetupapi - - include(windows/windows.pri) - - SOURCES += \ - qbluetoothdevicediscoveryagent_win.cpp \ - qbluetoothlocaldevice_win.cpp \ - qbluetoothserviceinfo_win.cpp \ - qbluetoothservicediscoveryagent_win.cpp \ - qbluetoothsocket_win.cpp \ - qbluetoothserver_win.cpp \ - qlowenergycontroller_win.cpp - - HEADERS += qlowenergycontroller_win_p.h \ - qbluetoothsocket_win_p.h -} else { - message("Unsupported Bluetooth platform, will not build a working QtBluetooth library.") - message("Either no Qt D-Bus found or no BlueZ headers available.") - include(dummy/dummy.pri) - SOURCES += \ - qbluetoothdevicediscoveryagent_p.cpp \ - qbluetoothlocaldevice_p.cpp \ - qbluetoothserviceinfo_p.cpp \ - qbluetoothservicediscoveryagent_p.cpp \ - qbluetoothsocket_dummy.cpp \ - qbluetoothserver_p.cpp \ - qlowenergycontroller_dummy.cpp - - HEADERS += qlowenergycontroller_dummy_p.h \ - qbluetoothsocket_dummy_p.h -} - -OTHER_FILES += - -load(qt_module) diff --git a/src/bluetooth/doc/snippets/snippets.pro b/src/bluetooth/doc/snippets/snippets.pro deleted file mode 100644 index f59983ee..00000000 --- a/src/bluetooth/doc/snippets/snippets.pro +++ /dev/null @@ -1,8 +0,0 @@ -TEMPLATE = app -TARGET = bluetooth_cppsnippet -QT = core -#! [contacts project modification] -QT += bluetooth -#! [contacts project modification] - -SOURCES += doc_src_qtbluetooth.cpp diff --git a/src/imports/CMakeLists.txt b/src/imports/CMakeLists.txt index 2bb27a85..1f1be393 100644 --- a/src/imports/CMakeLists.txt +++ b/src/imports/CMakeLists.txt @@ -1,5 +1,3 @@ -# Generated from imports.pro. - if(TARGET Qt::Bluetooth) add_subdirectory(bluetooth) endif() diff --git a/src/imports/bluetooth/.prev_CMakeLists.txt b/src/imports/bluetooth/.prev_CMakeLists.txt deleted file mode 100644 index 7cf1d0bd..00000000 --- a/src/imports/bluetooth/.prev_CMakeLists.txt +++ /dev/null @@ -1,27 +0,0 @@ -# Generated from bluetooth.pro. - -##################################################################### -## bluetooth Plugin: -##################################################################### - -qt_internal_add_qml_module(bluetooth - URI "QtBluetooth" - VERSION "${CMAKE_PROJECT_VERSION}" - CLASSNAME QBluetoothQmlPlugin - SKIP_TYPE_REGISTRATION - SOURCES - plugin.cpp - qdeclarativebluetoothdiscoverymodel.cpp qdeclarativebluetoothdiscoverymodel_p.h - qdeclarativebluetoothservice.cpp qdeclarativebluetoothservice_p.h - qdeclarativebluetoothsocket.cpp qdeclarativebluetoothsocket_p.h - DEFINES - QT_DISABLE_DEPRECATED_BEFORE=0 - PUBLIC_LIBRARIES - Qt::Bluetooth - Qt::Core - Qt::Quick -) - -#### Keys ignored in scope 1:.:.:bluetooth.pro:<TRUE>: -# QML_IMPORT_VERSION = "$$QT_VERSION" -# TARGETPATH = "QtBluetooth" diff --git a/src/imports/bluetooth/CMakeLists.txt b/src/imports/bluetooth/CMakeLists.txt index 5b81ac6d..5027ba9f 100644 --- a/src/imports/bluetooth/CMakeLists.txt +++ b/src/imports/bluetooth/CMakeLists.txt @@ -1,10 +1,8 @@ -# Generated from bluetooth.pro. - ##################################################################### ## bluetooth Plugin: ##################################################################### -qt_internal_add_qml_module(declarative_bluetooth # special case +qt_internal_add_qml_module(declarative_bluetooth URI "QtBluetooth" VERSION "${CMAKE_PROJECT_VERSION}" CLASSNAME QBluetoothQmlPlugin diff --git a/src/imports/bluetooth/bluetooth.pro b/src/imports/bluetooth/bluetooth.pro deleted file mode 100644 index eefe2fd5..00000000 --- a/src/imports/bluetooth/bluetooth.pro +++ /dev/null @@ -1,18 +0,0 @@ -TARGETPATH = QtBluetooth -QML_IMPORT_VERSION = $$QT_VERSION - -QT = core quick bluetooth - -HEADERS += \ - qdeclarativebluetoothservice_p.h \ - qdeclarativebluetoothsocket_p.h \ - qdeclarativebluetoothdiscoverymodel_p.h - -SOURCES += plugin.cpp \ - qdeclarativebluetoothservice.cpp \ - qdeclarativebluetoothsocket.cpp \ - qdeclarativebluetoothdiscoverymodel.cpp - -DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 - -load(qml_plugin) diff --git a/src/imports/imports.pro b/src/imports/imports.pro deleted file mode 100644 index dcc7385a..00000000 --- a/src/imports/imports.pro +++ /dev/null @@ -1,3 +0,0 @@ -TEMPLATE = subdirs - -qtHaveModule(bluetooth): SUBDIRS += bluetooth diff --git a/src/nfc/.prev_CMakeLists.txt b/src/nfc/.prev_CMakeLists.txt deleted file mode 100644 index aa82fce8..00000000 --- a/src/nfc/.prev_CMakeLists.txt +++ /dev/null @@ -1,68 +0,0 @@ -# Generated from nfc.pro. - -##################################################################### -## Nfc Module: -##################################################################### - -qt_internal_add_module(Nfc - SOURCES - qndeffilter.cpp qndeffilter.h - qndefmessage.cpp qndefmessage.h - qndefnfcsmartposterrecord.cpp qndefnfcsmartposterrecord.h qndefnfcsmartposterrecord_p.h - qndefnfctextrecord.cpp qndefnfctextrecord.h - qndefnfcurirecord.cpp qndefnfcurirecord.h - qndefrecord.cpp qndefrecord.h qndefrecord_p.h - qnearfieldmanager.cpp qnearfieldmanager.h qnearfieldmanager_p.h - qnearfieldtagtype1.cpp qnearfieldtagtype1_p.h - qnearfieldtagtype2.cpp qnearfieldtagtype2_p.h - qnearfieldtarget.cpp qnearfieldtarget.h qnearfieldtarget_p.cpp qnearfieldtarget_p.h - qtlv.cpp qtlv_p.h - qtnfcglobal.h qtnfcglobal_p.h - DEFINES - QT_NO_FOREACH - PUBLIC_LIBRARIES - Qt::Core - Qt::Network -) - -#### Keys ignored in scope 1:.:.:nfc.pro:<TRUE>: -# OTHER_FILES = "doc/src/*.qdoc" - -## Scopes: -##################################################################### - -if(ANDROID AND (ANDROID AND NOT ANDROID_EMBEDDED)) - set_property(TARGET Nfc APPEND PROPERTY QT_ANDROID_BUNDLED_JAR_DEPENDENCIES - jar/QtAndroidNfc.jar:org.qtproject.qt.android.nfc.QtNfc - ) - set_property(TARGET Nfc APPEND PROPERTY QT_ANDROID_PERMISSIONS - android.permission.NFC - ) -endif() - -qt_internal_extend_target(Nfc CONDITION ANDROID AND NOT ANDROID_EMBEDDED - SOURCES - android/androidjninfc.cpp android/androidjninfc_p.h - android/androidmainnewintentlistener.cpp android/androidmainnewintentlistener_p.h - qnearfieldmanager_android.cpp qnearfieldmanager_android_p.h - qnearfieldtarget_android.cpp qnearfieldtarget_android_p.h - DEFINES - ANDROID_NFC - QT_ANDROID_NFC - LIBRARIES - Qt::AndroidExtras - Qt::CorePrivate - Qt::Gui -) - -#### Keys ignored in scope 2:.:.:nfc.pro:ANDROID AND NOT ANDROID_EMBEDDED: -# NFC_BACKEND_AVAILABLE = "yes" - -qt_internal_extend_target(Nfc CONDITION NFC_BACKEND_AVAILABLE_ISEMPTY - SOURCES - qnearfieldmanager_generic.cpp qnearfieldmanager_generic_p.h -) -qt_internal_add_docs(Nfc - doc/qtnfc.qdocconf -) - diff --git a/src/nfc/CMakeLists.txt b/src/nfc/CMakeLists.txt index c6861692..c9d9aeed 100644 --- a/src/nfc/CMakeLists.txt +++ b/src/nfc/CMakeLists.txt @@ -1,5 +1,3 @@ -# Generated from nfc.pro. - ##################################################################### ## Nfc Module: ##################################################################### @@ -33,12 +31,12 @@ qt_internal_add_module(Nfc if(ANDROID AND (ANDROID AND NOT ANDROID_EMBEDDED)) set_property(TARGET Nfc APPEND PROPERTY QT_ANDROID_BUNDLED_JAR_DEPENDENCIES - jar/Qt${QtConnectivity_VERSION_MAJOR}AndroidNfc.jar:org.qtproject.qt.android.nfc.QtNfc # special case + jar/Qt${QtConnectivity_VERSION_MAJOR}AndroidNfc.jar:org.qtproject.qt.android.nfc.QtNfc ) set_property(TARGET Nfc APPEND PROPERTY QT_ANDROID_PERMISSIONS android.permission.NFC ) - set(NFC_BACKEND_AVAILABLE ON) # special case + set(NFC_BACKEND_AVAILABLE ON) endif() qt_internal_extend_target(Nfc CONDITION ANDROID AND NOT ANDROID_EMBEDDED @@ -59,10 +57,7 @@ qt_internal_extend_target(Nfc CONDITION ANDROID AND NOT ANDROID_EMBEDDED #### Keys ignored in scope 2:.:.:nfc.pro:ANDROID AND NOT ANDROID_EMBEDDED: # NFC_BACKEND_AVAILABLE = "yes" -# special case begin -# qt_internal_extend_target(Nfc CONDITION NFC_BACKEND_AVAILABLE_ISEMPTY qt_internal_extend_target(Nfc CONDITION NOT NFC_BACKEND_AVAILABLE -# special case end SOURCES qnearfieldmanager_generic.cpp qnearfieldmanager_generic_p.h ) diff --git a/src/nfc/doc/snippets/snippets.pro b/src/nfc/doc/snippets/snippets.pro deleted file mode 100644 index 336bfae5..00000000 --- a/src/nfc/doc/snippets/snippets.pro +++ /dev/null @@ -1,9 +0,0 @@ -TEMPLATE = app -TARGET = nfc_cppsnippet -QT = core -#! [project modification] -QT += nfc -#! [project modification] - -SOURCES += main.cpp \ - nfc.cpp diff --git a/src/nfc/nfc.pro b/src/nfc/nfc.pro deleted file mode 100644 index d97253bf..00000000 --- a/src/nfc/nfc.pro +++ /dev/null @@ -1,75 +0,0 @@ -TARGET = QtNfc -QT = core network -DEFINES += QT_NO_FOREACH - -QMAKE_DOCS = $$PWD/doc/qtnfc.qdocconf -OTHER_FILES += doc/src/*.qdoc # show .qdoc files in Qt Creator - -HEADERS += \ - qtnfcglobal.h \ - qnearfieldmanager.h \ - qnearfieldtarget.h \ - qndefrecord.h \ - qndefnfctextrecord.h \ - qndefmessage.h \ - qndeffilter.h \ - qndefnfcurirecord.h \ - qndefnfcsmartposterrecord.h \ - qtnfcglobal_p.h \ - qndefrecord_p.h \ - qnearfieldtarget_p.h \ - qnearfieldmanager_p.h \ - qnearfieldtagtype1_p.h \ - qnearfieldtagtype2_p.h \ - qtlv_p.h \ - qndefnfcsmartposterrecord_p.h - -SOURCES += \ - qnearfieldmanager.cpp \ - qnearfieldtarget.cpp \ - qnearfieldtarget_p.cpp \ - qndefrecord.cpp \ - qndefnfctextrecord.cpp \ - qndefmessage.cpp \ - qndeffilter.cpp \ - qndefnfcurirecord.cpp \ - qnearfieldtagtype1.cpp \ - qnearfieldtagtype2.cpp \ - qtlv.cpp \ - qndefnfcsmartposterrecord.cpp - -android:!android-embedded { - NFC_BACKEND_AVAILABLE = yes - DEFINES += QT_ANDROID_NFC - ANDROID_PERMISSIONS = \ - android.permission.NFC - ANDROID_BUNDLED_JAR_DEPENDENCIES = \ - jar/Qt$${QT_MAJOR_VERSION}AndroidNfc.jar:org.qtproject.qt.android.nfc.QtNfc - DEFINES += ANDROID_NFC - QT_PRIVATE += core-private gui androidextras - - HEADERS += \ - android/androidjninfc_p.h \ - qnearfieldmanager_android_p.h \ - qnearfieldtarget_android_p.h \ - android/androidmainnewintentlistener_p.h - - - SOURCES += \ - android/androidjninfc.cpp \ - qnearfieldmanager_android.cpp \ - qnearfieldtarget_android.cpp \ - android/androidmainnewintentlistener.cpp -} - -isEmpty(NFC_BACKEND_AVAILABLE) { - message("Unsupported NFC platform, will not build a working QtNfc library.") - - HEADERS += \ - qnearfieldmanager_generic_p.h - - SOURCES += \ - qnearfieldmanager_generic.cpp -} - -load(qt_module) diff --git a/src/src.pro b/src/src.pro deleted file mode 100644 index 3811003b..00000000 --- a/src/src.pro +++ /dev/null @@ -1,27 +0,0 @@ -TEMPLATE = subdirs - -SUBDIRS += bluetooth nfc -android { - SUBDIRS += android - android.depends += bluetooth nfc -} - -contains(QT_CONFIG, private_tests) { - bluetooth_doc_snippets.subdir = bluetooth/doc/snippets - bluetooth_doc_snippets.depends = bluetooth - - SUBDIRS += bluetooth_doc_snippets -} - -qtHaveModule(quick) { - imports.depends += bluetooth nfc - SUBDIRS += imports -} - -include($$OUT_PWD/bluetooth/qtbluetooth-config.pri) -QT_FOR_CONFIG += bluetooth -qtConfig(bluez) { - sdpscanner.subdir = tools/sdpscanner - sdpscanner.depends = bluetooth - SUBDIRS += sdpscanner -} diff --git a/src/tools/sdpscanner/.prev_CMakeLists.txt b/src/tools/sdpscanner/.prev_CMakeLists.txt deleted file mode 100644 index 8ee582c9..00000000 --- a/src/tools/sdpscanner/.prev_CMakeLists.txt +++ /dev/null @@ -1,20 +0,0 @@ -# Generated from sdpscanner.pro. - -##################################################################### -## sdpscanner Tool: -##################################################################### - -qt_get_tool_target_name(target_name sdpscanner) -qt_internal_add_tool(${target_name} - SOURCES - main.cpp - PUBLIC_LIBRARIES - PkgConfig::BlueZ -) - -#### Keys ignored in scope 1:.:.:sdpscanner.pro:<TRUE>: -# QT_FOR_CONFIG = "bluetooth-private" -# TEMPLATE = "app" - -## Scopes: -##################################################################### diff --git a/src/tools/sdpscanner/CMakeLists.txt b/src/tools/sdpscanner/CMakeLists.txt index 483fea27..fc0208a9 100644 --- a/src/tools/sdpscanner/CMakeLists.txt +++ b/src/tools/sdpscanner/CMakeLists.txt @@ -1,19 +1,15 @@ -# Generated from sdpscanner.pro. - ##################################################################### ## sdpscanner Tool: ##################################################################### -# special case begin if(NOT TARGET PkgConfig::BLUEZ) qt_find_package(BlueZ PROVIDED_TARGETS PkgConfig::BLUEZ) endif() -# special case end qt_get_tool_target_name(target_name sdpscanner) qt_internal_add_tool(${target_name} - TOOLS_TARGET Bluetooth # special case + TOOLS_TARGET Bluetooth SOURCES main.cpp PUBLIC_LIBRARIES diff --git a/src/tools/sdpscanner/sdpscanner.pro b/src/tools/sdpscanner/sdpscanner.pro deleted file mode 100644 index 78610ebd..00000000 --- a/src/tools/sdpscanner/sdpscanner.pro +++ /dev/null @@ -1,16 +0,0 @@ -TEMPLATE = app -TARGET = sdpscanner - -QT = core - -SOURCES = main.cpp - -QT_FOR_CONFIG += bluetooth-private -QMAKE_USE += bluez - -load(qt_tool) - -linux-*: { - # bluetooth.h is not standards compliant - CONFIG -= strict_c++ -} diff --git a/tests/.prev_CMakeLists.txt b/tests/.prev_CMakeLists.txt deleted file mode 100644 index 22141371..00000000 --- a/tests/.prev_CMakeLists.txt +++ /dev/null @@ -1,7 +0,0 @@ -# Generated from tests.pro. - -if(QT_BUILD_STANDALONE_TESTS) - # Add qt_find_package calls for extra dependencies that need to be found when building - # the standalone tests here. -endif() -qt_build_tests() diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index cc8be614..cbb34b65 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -1,4 +1,3 @@ -# special case begin if(NOT TARGET Qt::Test) cmake_minimum_required(VERSION 3.15.0) project(QtConnectivityTests VERSION 6.0.0 LANGUAGES C CXX) @@ -13,5 +12,5 @@ if(TARGET Qt::Bluetooth) add_subdirectory(bttestui) endif() endif() -# special case end + qt_build_tests() diff --git a/tests/auto/.prev_CMakeLists.txt b/tests/auto/.prev_CMakeLists.txt deleted file mode 100644 index 99e0496f..00000000 --- a/tests/auto/.prev_CMakeLists.txt +++ /dev/null @@ -1,30 +0,0 @@ -# Generated from auto.pro. - -add_subdirectory(cmake) -if(TARGET Qt::Bluetooth) - add_subdirectory(qbluetoothaddress) - add_subdirectory(qbluetoothdevicediscoveryagent) - add_subdirectory(qbluetoothdeviceinfo) - add_subdirectory(qbluetoothlocaldevice) - add_subdirectory(qbluetoothhostinfo) - add_subdirectory(qbluetoothservicediscoveryagent) - add_subdirectory(qbluetoothserviceinfo) - add_subdirectory(qbluetoothsocket) - add_subdirectory(qbluetoothtransfermanager) - add_subdirectory(qbluetoothtransferrequest) - add_subdirectory(qbluetoothuuid) - add_subdirectory(qbluetoothserver) - add_subdirectory(qlowenergycharacteristic) - add_subdirectory(qlowenergydescriptor) - add_subdirectory(qlowenergycontroller) - add_subdirectory(qlowenergycontroller-gattserver) - add_subdirectory(qlowenergyservice) -endif() -if(TARGET Qt::Nfc) - add_subdirectory(qndefmessage) - add_subdirectory(qndefrecord) - add_subdirectory(qnearfieldmanager) - add_subdirectory(qnearfieldtagtype1) - add_subdirectory(qnearfieldtagtype2) - add_subdirectory(qndefnfcsmartposterrecord) -endif() diff --git a/tests/auto/CMakeLists.txt b/tests/auto/CMakeLists.txt index ace903f8..f88057b6 100644 --- a/tests/auto/CMakeLists.txt +++ b/tests/auto/CMakeLists.txt @@ -1,6 +1,3 @@ -# Generated from auto.pro. - -# add_subdirectory(cmake) # special case if(TARGET Qt::Bluetooth) add_subdirectory(qbluetoothaddress) add_subdirectory(qbluetoothdevicediscoveryagent) diff --git a/tests/auto/auto.pro b/tests/auto/auto.pro deleted file mode 100644 index f1112240..00000000 --- a/tests/auto/auto.pro +++ /dev/null @@ -1,35 +0,0 @@ -TEMPLATE = subdirs - -SUBDIRS += \ - cmake - -qtHaveModule(bluetooth) { - SUBDIRS += \ - qbluetoothaddress \ - qbluetoothdevicediscoveryagent \ - qbluetoothdeviceinfo \ - qbluetoothlocaldevice \ - qbluetoothhostinfo \ - qbluetoothservicediscoveryagent \ - qbluetoothserviceinfo \ - qbluetoothsocket \ - qbluetoothtransfermanager \ - qbluetoothtransferrequest \ - qbluetoothuuid \ - qbluetoothserver \ - qlowenergycharacteristic \ - qlowenergydescriptor \ - qlowenergycontroller \ - qlowenergycontroller-gattserver \ - qlowenergyservice -} - -qtHaveModule(nfc) { - SUBDIRS += \ - qndefmessage \ - qndefrecord \ - qnearfieldmanager \ - qnearfieldtagtype1 \ - qnearfieldtagtype2 \ - qndefnfcsmartposterrecord -} diff --git a/tests/auto/cmake/cmake.pro b/tests/auto/cmake/cmake.pro deleted file mode 100644 index 7bd2c29e..00000000 --- a/tests/auto/cmake/cmake.pro +++ /dev/null @@ -1,7 +0,0 @@ - -# Cause make to do nothing. -TEMPLATE = subdirs - -CMAKE_QT_MODULES_UNDER_TEST = bluetooth nfc - -CONFIG += ctest_testcase diff --git a/tests/auto/qbluetoothaddress/CMakeLists.txt b/tests/auto/qbluetoothaddress/CMakeLists.txt index 5221d939..fd2ccd82 100644 --- a/tests/auto/qbluetoothaddress/CMakeLists.txt +++ b/tests/auto/qbluetoothaddress/CMakeLists.txt @@ -1,5 +1,3 @@ -# Generated from qbluetoothaddress.pro. - ##################################################################### ## tst_qbluetoothaddress Test: ##################################################################### diff --git a/tests/auto/qbluetoothaddress/qbluetoothaddress.pro b/tests/auto/qbluetoothaddress/qbluetoothaddress.pro deleted file mode 100644 index f87551e8..00000000 --- a/tests/auto/qbluetoothaddress/qbluetoothaddress.pro +++ /dev/null @@ -1,6 +0,0 @@ -SOURCES += tst_qbluetoothaddress.cpp -TARGET = tst_qbluetoothaddress -CONFIG += testcase - -QT = core concurrent bluetooth testlib - diff --git a/tests/auto/qbluetoothdevicediscoveryagent/CMakeLists.txt b/tests/auto/qbluetoothdevicediscoveryagent/CMakeLists.txt index 39eb8181..6bbe0589 100644 --- a/tests/auto/qbluetoothdevicediscoveryagent/CMakeLists.txt +++ b/tests/auto/qbluetoothdevicediscoveryagent/CMakeLists.txt @@ -1,5 +1,3 @@ -# Generated from qbluetoothdevicediscoveryagent.pro. - ##################################################################### ## tst_qbluetoothdevicediscoveryagent Test: ##################################################################### diff --git a/tests/auto/qbluetoothdevicediscoveryagent/qbluetoothdevicediscoveryagent.pro b/tests/auto/qbluetoothdevicediscoveryagent/qbluetoothdevicediscoveryagent.pro deleted file mode 100644 index 900bb5e9..00000000 --- a/tests/auto/qbluetoothdevicediscoveryagent/qbluetoothdevicediscoveryagent.pro +++ /dev/null @@ -1,6 +0,0 @@ -SOURCES += tst_qbluetoothdevicediscoveryagent.cpp -TARGET=tst_qbluetoothdevicediscoveryagent -CONFIG += testcase - -QT = core concurrent bluetooth-private testlib -osx:QT += widgets diff --git a/tests/auto/qbluetoothdeviceinfo/CMakeLists.txt b/tests/auto/qbluetoothdeviceinfo/CMakeLists.txt index 29e6f03e..5a9abce9 100644 --- a/tests/auto/qbluetoothdeviceinfo/CMakeLists.txt +++ b/tests/auto/qbluetoothdeviceinfo/CMakeLists.txt @@ -1,5 +1,3 @@ -# Generated from qbluetoothdeviceinfo.pro. - ##################################################################### ## tst_qbluetoothdeviceinfo Test: ##################################################################### diff --git a/tests/auto/qbluetoothdeviceinfo/qbluetoothdeviceinfo.pro b/tests/auto/qbluetoothdeviceinfo/qbluetoothdeviceinfo.pro deleted file mode 100644 index a12da314..00000000 --- a/tests/auto/qbluetoothdeviceinfo/qbluetoothdeviceinfo.pro +++ /dev/null @@ -1,5 +0,0 @@ -SOURCES += tst_qbluetoothdeviceinfo.cpp -TARGET=tst_qbluetoothdeviceinfo -CONFIG += testcase - -QT = core concurrent bluetooth testlib diff --git a/tests/auto/qbluetoothhostinfo/CMakeLists.txt b/tests/auto/qbluetoothhostinfo/CMakeLists.txt index 7a15af9a..c7eb5dee 100644 --- a/tests/auto/qbluetoothhostinfo/CMakeLists.txt +++ b/tests/auto/qbluetoothhostinfo/CMakeLists.txt @@ -1,5 +1,3 @@ -# Generated from qbluetoothhostinfo.pro. - ##################################################################### ## tst_qbluetoothhostinfo Test: ##################################################################### diff --git a/tests/auto/qbluetoothhostinfo/qbluetoothhostinfo.pro b/tests/auto/qbluetoothhostinfo/qbluetoothhostinfo.pro deleted file mode 100644 index 58776a65..00000000 --- a/tests/auto/qbluetoothhostinfo/qbluetoothhostinfo.pro +++ /dev/null @@ -1,6 +0,0 @@ -SOURCES += tst_qbluetoothhostinfo.cpp -TARGET = tst_qbluetoothhostinfo -CONFIG += testcase - -QT = core concurrent bluetooth testlib - diff --git a/tests/auto/qbluetoothlocaldevice/CMakeLists.txt b/tests/auto/qbluetoothlocaldevice/CMakeLists.txt index ea24631d..bba323a8 100644 --- a/tests/auto/qbluetoothlocaldevice/CMakeLists.txt +++ b/tests/auto/qbluetoothlocaldevice/CMakeLists.txt @@ -1,5 +1,3 @@ -# Generated from qbluetoothlocaldevice.pro. - ##################################################################### ## tst_qbluetoothlocaldevice Test: ##################################################################### diff --git a/tests/auto/qbluetoothlocaldevice/qbluetoothlocaldevice.pro b/tests/auto/qbluetoothlocaldevice/qbluetoothlocaldevice.pro deleted file mode 100644 index 1c4da732..00000000 --- a/tests/auto/qbluetoothlocaldevice/qbluetoothlocaldevice.pro +++ /dev/null @@ -1,6 +0,0 @@ -SOURCES += tst_qbluetoothlocaldevice.cpp -TARGET=tst_qbluetoothlocaldevice -CONFIG += testcase - -QT = core concurrent bluetooth-private testlib -osx:QT += widgets diff --git a/tests/auto/qbluetoothserver/CMakeLists.txt b/tests/auto/qbluetoothserver/CMakeLists.txt index 899f1292..8513e67c 100644 --- a/tests/auto/qbluetoothserver/CMakeLists.txt +++ b/tests/auto/qbluetoothserver/CMakeLists.txt @@ -1,5 +1,3 @@ -# Generated from qbluetoothserver.pro. - ##################################################################### ## tst_qbluetoothserver Test: ##################################################################### diff --git a/tests/auto/qbluetoothserver/qbluetoothserver.pro b/tests/auto/qbluetoothserver/qbluetoothserver.pro deleted file mode 100644 index 7d7eb66b..00000000 --- a/tests/auto/qbluetoothserver/qbluetoothserver.pro +++ /dev/null @@ -1,10 +0,0 @@ -SOURCES += tst_qbluetoothserver.cpp -TARGET = tst_qbluetoothserver -CONFIG += testcase - -QT = core concurrent bluetooth-private testlib -osx:QT += widgets - -OTHER_FILES += \ - README.txt - diff --git a/tests/auto/qbluetoothservicediscoveryagent/CMakeLists.txt b/tests/auto/qbluetoothservicediscoveryagent/CMakeLists.txt index ef3cbab8..4cc44a97 100644 --- a/tests/auto/qbluetoothservicediscoveryagent/CMakeLists.txt +++ b/tests/auto/qbluetoothservicediscoveryagent/CMakeLists.txt @@ -1,5 +1,3 @@ -# Generated from qbluetoothservicediscoveryagent.pro. - ##################################################################### ## tst_qbluetoothservicediscoveryagent Test: ##################################################################### diff --git a/tests/auto/qbluetoothservicediscoveryagent/qbluetoothservicediscoveryagent.pro b/tests/auto/qbluetoothservicediscoveryagent/qbluetoothservicediscoveryagent.pro deleted file mode 100644 index 7d4eba6f..00000000 --- a/tests/auto/qbluetoothservicediscoveryagent/qbluetoothservicediscoveryagent.pro +++ /dev/null @@ -1,7 +0,0 @@ -SOURCES += tst_qbluetoothservicediscoveryagent.cpp -TARGET = tst_qbluetoothservicediscoveryagent -CONFIG += testcase - -QT = core concurrent bluetooth testlib -osx:QT += widgets - diff --git a/tests/auto/qbluetoothserviceinfo/CMakeLists.txt b/tests/auto/qbluetoothserviceinfo/CMakeLists.txt index a54f1438..08be5b48 100644 --- a/tests/auto/qbluetoothserviceinfo/CMakeLists.txt +++ b/tests/auto/qbluetoothserviceinfo/CMakeLists.txt @@ -1,5 +1,3 @@ -# Generated from qbluetoothserviceinfo.pro. - ##################################################################### ## tst_qbluetoothserviceinfo Test: ##################################################################### diff --git a/tests/auto/qbluetoothserviceinfo/qbluetoothserviceinfo.pro b/tests/auto/qbluetoothserviceinfo/qbluetoothserviceinfo.pro deleted file mode 100644 index 6a072784..00000000 --- a/tests/auto/qbluetoothserviceinfo/qbluetoothserviceinfo.pro +++ /dev/null @@ -1,11 +0,0 @@ -SOURCES += tst_qbluetoothserviceinfo.cpp -TARGET = tst_qbluetoothserviceinfo -CONFIG += testcase - -QT = core concurrent bluetooth testlib -osx:QT += widgets - - -android:!android-embedded { - DEFINES += QT_ANDROID_BLUETOOTH -} diff --git a/tests/auto/qbluetoothsocket/CMakeLists.txt b/tests/auto/qbluetoothsocket/CMakeLists.txt index 3d52d19e..ca66ae03 100644 --- a/tests/auto/qbluetoothsocket/CMakeLists.txt +++ b/tests/auto/qbluetoothsocket/CMakeLists.txt @@ -1,5 +1,3 @@ -# Generated from qbluetoothsocket.pro. - ##################################################################### ## tst_qbluetoothsocket Test: ##################################################################### diff --git a/tests/auto/qbluetoothsocket/qbluetoothsocket.pro b/tests/auto/qbluetoothsocket/qbluetoothsocket.pro deleted file mode 100644 index 83bc417c..00000000 --- a/tests/auto/qbluetoothsocket/qbluetoothsocket.pro +++ /dev/null @@ -1,16 +0,0 @@ -SOURCES += tst_qbluetoothsocket.cpp -TARGET = tst_qbluetoothsocket -CONFIG += testcase -testcase.timeout = 250 # this test is slow - -QT = core concurrent network bluetooth-private testlib -osx:QT += widgets - -OTHER_FILES += \ - README.txt - -osx { - DEFINES += QT_OSX_BLUETOOTH -} else:android:!android-embedded { - DEFINES += QT_ANDROID_BLUETOOTH -} diff --git a/tests/auto/qbluetoothtransfermanager/CMakeLists.txt b/tests/auto/qbluetoothtransfermanager/CMakeLists.txt index 12a7b744..8d5390d0 100644 --- a/tests/auto/qbluetoothtransfermanager/CMakeLists.txt +++ b/tests/auto/qbluetoothtransfermanager/CMakeLists.txt @@ -1,5 +1,3 @@ -# Generated from qbluetoothtransfermanager.pro. - ##################################################################### ## tst_qbluetoothtransfermanager Test: ##################################################################### diff --git a/tests/auto/qbluetoothtransfermanager/qbluetoothtransfermanager.pro b/tests/auto/qbluetoothtransfermanager/qbluetoothtransfermanager.pro deleted file mode 100644 index 8e0d22a5..00000000 --- a/tests/auto/qbluetoothtransfermanager/qbluetoothtransfermanager.pro +++ /dev/null @@ -1,8 +0,0 @@ -SOURCES += tst_qbluetoothtransfermanager.cpp -TARGET=tst_qbluetoothtransfermanager -CONFIG += testcase -testcase.timeout = 250 # this test is slow - -QT = core concurrent bluetooth testlib - -TESTDATA += *.txt diff --git a/tests/auto/qbluetoothtransferrequest/CMakeLists.txt b/tests/auto/qbluetoothtransferrequest/CMakeLists.txt index 3df2be4c..f77770c2 100644 --- a/tests/auto/qbluetoothtransferrequest/CMakeLists.txt +++ b/tests/auto/qbluetoothtransferrequest/CMakeLists.txt @@ -1,5 +1,3 @@ -# Generated from qbluetoothtransferrequest.pro. - ##################################################################### ## tst_qbluetoothtransferrequest Test: ##################################################################### diff --git a/tests/auto/qbluetoothtransferrequest/qbluetoothtransferrequest.pro b/tests/auto/qbluetoothtransferrequest/qbluetoothtransferrequest.pro deleted file mode 100644 index 2dfbfe09..00000000 --- a/tests/auto/qbluetoothtransferrequest/qbluetoothtransferrequest.pro +++ /dev/null @@ -1,5 +0,0 @@ -SOURCES += tst_qbluetoothtransferrequest.cpp -TARGET=tst_qbluetoothtransferrequest -CONFIG += testcase - -QT = core concurrent bluetooth testlib diff --git a/tests/auto/qbluetoothuuid/CMakeLists.txt b/tests/auto/qbluetoothuuid/CMakeLists.txt index d2c32f0a..382199fa 100644 --- a/tests/auto/qbluetoothuuid/CMakeLists.txt +++ b/tests/auto/qbluetoothuuid/CMakeLists.txt @@ -1,5 +1,3 @@ -# Generated from qbluetoothuuid.pro. - ##################################################################### ## tst_qbluetoothuuid Test: ##################################################################### diff --git a/tests/auto/qbluetoothuuid/qbluetoothuuid.pro b/tests/auto/qbluetoothuuid/qbluetoothuuid.pro deleted file mode 100644 index 2d81c4af..00000000 --- a/tests/auto/qbluetoothuuid/qbluetoothuuid.pro +++ /dev/null @@ -1,5 +0,0 @@ -SOURCES += tst_qbluetoothuuid.cpp -TARGET = tst_qbluetoothuuid -CONFIG += testcase - -QT = core concurrent bluetooth testlib diff --git a/tests/auto/qlowenergycharacteristic/CMakeLists.txt b/tests/auto/qlowenergycharacteristic/CMakeLists.txt index ffb37f5e..43932a68 100644 --- a/tests/auto/qlowenergycharacteristic/CMakeLists.txt +++ b/tests/auto/qlowenergycharacteristic/CMakeLists.txt @@ -1,5 +1,3 @@ -# Generated from qlowenergycharacteristic.pro. - ##################################################################### ## tst_qlowenergycharacteristic Test: ##################################################################### diff --git a/tests/auto/qlowenergycharacteristic/qlowenergycharacteristic.pro b/tests/auto/qlowenergycharacteristic/qlowenergycharacteristic.pro deleted file mode 100644 index 24106573..00000000 --- a/tests/auto/qlowenergycharacteristic/qlowenergycharacteristic.pro +++ /dev/null @@ -1,7 +0,0 @@ -SOURCES += tst_qlowenergycharacteristic.cpp -TARGET = tst_qlowenergycharacteristic -CONFIG += testcase - -QT = core bluetooth testlib - - diff --git a/tests/auto/qlowenergycontroller-gattserver/CMakeLists.txt b/tests/auto/qlowenergycontroller-gattserver/CMakeLists.txt index 84f9d1ac..5659ea8c 100644 --- a/tests/auto/qlowenergycontroller-gattserver/CMakeLists.txt +++ b/tests/auto/qlowenergycontroller-gattserver/CMakeLists.txt @@ -1,4 +1,2 @@ -# Generated from qlowenergycontroller-gattserver.pro. - add_subdirectory(server) add_subdirectory(test) diff --git a/tests/auto/qlowenergycontroller-gattserver/qlowenergycontroller-gattserver.pro b/tests/auto/qlowenergycontroller-gattserver/qlowenergycontroller-gattserver.pro deleted file mode 100644 index 8b6c52e7..00000000 --- a/tests/auto/qlowenergycontroller-gattserver/qlowenergycontroller-gattserver.pro +++ /dev/null @@ -1,2 +0,0 @@ -TEMPLATE = subdirs -SUBDIRS = server test diff --git a/tests/auto/qlowenergycontroller-gattserver/server/.prev_CMakeLists.txt b/tests/auto/qlowenergycontroller-gattserver/server/.prev_CMakeLists.txt deleted file mode 100644 index 989f43f9..00000000 --- a/tests/auto/qlowenergycontroller-gattserver/server/.prev_CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -# Generated from server.pro. - -##################################################################### -## server Binary: -##################################################################### - -qt_internal_add_executable(server - GUI - SOURCES - qlowenergycontroller-gattserver.cpp - PUBLIC_LIBRARIES - Qt::Bluetooth -) diff --git a/tests/auto/qlowenergycontroller-gattserver/server/CMakeLists.txt b/tests/auto/qlowenergycontroller-gattserver/server/CMakeLists.txt index 60d581c2..eb1e93cd 100644 --- a/tests/auto/qlowenergycontroller-gattserver/server/CMakeLists.txt +++ b/tests/auto/qlowenergycontroller-gattserver/server/CMakeLists.txt @@ -1,12 +1,10 @@ -# Generated from server.pro. - ##################################################################### ## server Binary: ##################################################################### qt_internal_add_executable(server GUI - OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}" # special case + OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}" SOURCES qlowenergycontroller-gattserver.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/qlowenergycontroller-gattserver/server/server.pro b/tests/auto/qlowenergycontroller-gattserver/server/server.pro deleted file mode 100644 index b9f2ccf9..00000000 --- a/tests/auto/qlowenergycontroller-gattserver/server/server.pro +++ /dev/null @@ -1,5 +0,0 @@ -QT = core bluetooth - -CONFIG += c++11 - -SOURCES = qlowenergycontroller-gattserver.cpp diff --git a/tests/auto/qlowenergycontroller-gattserver/test/CMakeLists.txt b/tests/auto/qlowenergycontroller-gattserver/test/CMakeLists.txt index da0eecbe..a1117f46 100644 --- a/tests/auto/qlowenergycontroller-gattserver/test/CMakeLists.txt +++ b/tests/auto/qlowenergycontroller-gattserver/test/CMakeLists.txt @@ -1,5 +1,3 @@ -# Generated from test.pro. - ##################################################################### ## tst_qlowenergycontroller-gattserver Test: ##################################################################### diff --git a/tests/auto/qlowenergycontroller-gattserver/test/test.pro b/tests/auto/qlowenergycontroller-gattserver/test/test.pro deleted file mode 100644 index 5f80e660..00000000 --- a/tests/auto/qlowenergycontroller-gattserver/test/test.pro +++ /dev/null @@ -1,12 +0,0 @@ -QT = core bluetooth bluetooth-private testlib - -TARGET = tst_qlowenergycontroller-gattserver -CONFIG += testcase c++11 - -qtConfig(linux_crypto_api): DEFINES += CONFIG_LINUX_CRYPTO_API -qtConfig(bluez_le): DEFINES += CONFIG_BLUEZ_LE - -SOURCES += tst_qlowenergycontroller-gattserver.cpp - -# qemu doesn't support all the needed socket operations -boot2qt: DEFINES += CHECK_CMAC_SUPPORT diff --git a/tests/auto/qlowenergycontroller/CMakeLists.txt b/tests/auto/qlowenergycontroller/CMakeLists.txt index 03fbc473..247ee758 100644 --- a/tests/auto/qlowenergycontroller/CMakeLists.txt +++ b/tests/auto/qlowenergycontroller/CMakeLists.txt @@ -1,5 +1,3 @@ -# Generated from qlowenergycontroller.pro. - ##################################################################### ## tst_qlowenergycontroller Test: ##################################################################### diff --git a/tests/auto/qlowenergycontroller/qlowenergycontroller.pro b/tests/auto/qlowenergycontroller/qlowenergycontroller.pro deleted file mode 100644 index 7a67e8e4..00000000 --- a/tests/auto/qlowenergycontroller/qlowenergycontroller.pro +++ /dev/null @@ -1,13 +0,0 @@ -QT = core bluetooth-private testlib - -# Android requires GUI application when running test -android: QT += widgets - -TARGET = tst_qlowenergycontroller -CONFIG += testcase - -SOURCES += tst_qlowenergycontroller.cpp - -osx|ios { - QT += widgets -} diff --git a/tests/auto/qlowenergydescriptor/CMakeLists.txt b/tests/auto/qlowenergydescriptor/CMakeLists.txt index 3c5941bc..310746e5 100644 --- a/tests/auto/qlowenergydescriptor/CMakeLists.txt +++ b/tests/auto/qlowenergydescriptor/CMakeLists.txt @@ -1,5 +1,3 @@ -# Generated from qlowenergydescriptor.pro. - ##################################################################### ## tst_qlowenergydescriptor Test: ##################################################################### diff --git a/tests/auto/qlowenergydescriptor/qlowenergydescriptor.pro b/tests/auto/qlowenergydescriptor/qlowenergydescriptor.pro deleted file mode 100644 index 81ec9566..00000000 --- a/tests/auto/qlowenergydescriptor/qlowenergydescriptor.pro +++ /dev/null @@ -1,6 +0,0 @@ -SOURCES += tst_qlowenergydescriptor.cpp -TARGET = tst_qlowenergydescriptor -CONFIG += testcase - -QT = core bluetooth testlib - diff --git a/tests/auto/qlowenergyservice/CMakeLists.txt b/tests/auto/qlowenergyservice/CMakeLists.txt index 6fefd678..5478cceb 100644 --- a/tests/auto/qlowenergyservice/CMakeLists.txt +++ b/tests/auto/qlowenergyservice/CMakeLists.txt @@ -1,5 +1,3 @@ -# Generated from qlowenergyservice.pro. - ##################################################################### ## tst_qlowenergyservice Test: ##################################################################### diff --git a/tests/auto/qlowenergyservice/qlowenergyservice.pro b/tests/auto/qlowenergyservice/qlowenergyservice.pro deleted file mode 100644 index 6d074d82..00000000 --- a/tests/auto/qlowenergyservice/qlowenergyservice.pro +++ /dev/null @@ -1,6 +0,0 @@ -SOURCES += tst_qlowenergyservice.cpp -TARGET = tst_qlowenergyservice -CONFIG += testcase - -QT = core bluetooth testlib - diff --git a/tests/auto/qndefmessage/CMakeLists.txt b/tests/auto/qndefmessage/CMakeLists.txt index 6985beb5..f0a60b72 100644 --- a/tests/auto/qndefmessage/CMakeLists.txt +++ b/tests/auto/qndefmessage/CMakeLists.txt @@ -1,5 +1,3 @@ -# Generated from qndefmessage.pro. - ##################################################################### ## tst_qndefmessage Test: ##################################################################### diff --git a/tests/auto/qndefmessage/qndefmessage.pro b/tests/auto/qndefmessage/qndefmessage.pro deleted file mode 100644 index c1309387..00000000 --- a/tests/auto/qndefmessage/qndefmessage.pro +++ /dev/null @@ -1,5 +0,0 @@ -SOURCES += tst_qndefmessage.cpp -TARGET = tst_qndefmessage -CONFIG += testcase - -QT = core nfc testlib diff --git a/tests/auto/qndefnfcsmartposterrecord/CMakeLists.txt b/tests/auto/qndefnfcsmartposterrecord/CMakeLists.txt index 7e1e5eee..db6d70ed 100644 --- a/tests/auto/qndefnfcsmartposterrecord/CMakeLists.txt +++ b/tests/auto/qndefnfcsmartposterrecord/CMakeLists.txt @@ -1,5 +1,3 @@ -# Generated from qndefnfcsmartposterrecord.pro. - ##################################################################### ## tst_qndefnfcsmartposterrecord Test: ##################################################################### diff --git a/tests/auto/qndefnfcsmartposterrecord/qndefnfcsmartposterrecord.pro b/tests/auto/qndefnfcsmartposterrecord/qndefnfcsmartposterrecord.pro deleted file mode 100644 index 52766cfd..00000000 --- a/tests/auto/qndefnfcsmartposterrecord/qndefnfcsmartposterrecord.pro +++ /dev/null @@ -1,5 +0,0 @@ -SOURCES += tst_qndefnfcsmartposterrecord.cpp -TARGET = tst_qndefnfcsmartposterrecord -CONFIG += testcase - -QT = core nfc testlib diff --git a/tests/auto/qndefrecord/CMakeLists.txt b/tests/auto/qndefrecord/CMakeLists.txt index eaf806b9..331454fc 100644 --- a/tests/auto/qndefrecord/CMakeLists.txt +++ b/tests/auto/qndefrecord/CMakeLists.txt @@ -1,5 +1,3 @@ -# Generated from qndefrecord.pro. - ##################################################################### ## tst_qndefrecord Test: ##################################################################### diff --git a/tests/auto/qndefrecord/qndefrecord.pro b/tests/auto/qndefrecord/qndefrecord.pro deleted file mode 100644 index e87f8b62..00000000 --- a/tests/auto/qndefrecord/qndefrecord.pro +++ /dev/null @@ -1,5 +0,0 @@ -SOURCES += tst_qndefrecord.cpp -TARGET = tst_qndefrecord -CONFIG += testcase - -QT = core nfc testlib diff --git a/tests/auto/qnearfieldmanager/.prev_CMakeLists.txt b/tests/auto/qnearfieldmanager/.prev_CMakeLists.txt deleted file mode 100644 index 9294d8d8..00000000 --- a/tests/auto/qnearfieldmanager/.prev_CMakeLists.txt +++ /dev/null @@ -1,39 +0,0 @@ -# Generated from qnearfieldmanager.pro. - -if(NOT QT_CONFIG___contains___private_tests) - return() -endif() - -##################################################################### -## tst_qnearfieldmanager Test: -##################################################################### - -# Collect test data -list(APPEND test_data "${CMAKE_CURRENT_SOURCE_DIR}/../nfcdata/Qt Labs Website Tag Type1.nfc") -list(APPEND test_data "${CMAKE_CURRENT_SOURCE_DIR}/../nfcdata/Qt Website Tag Type1.nfc") - -qt_internal_add_test(tst_qnearfieldmanager - SOURCES - ../../../src/nfc/qnearfieldmanager_emulator.cpp ../../../src/nfc/qnearfieldmanager_emulator_p.h - ../../../src/nfc/qnearfieldtarget_emulator.cpp ../../../src/nfc/qnearfieldtarget_emulator_p.h - ../../../src/nfc/targetemulator.cpp ../../../src/nfc/targetemulator_p.h - tst_qnearfieldmanager.cpp - DEFINES - SRCDIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../nfcdata\\\" - INCLUDE_DIRECTORIES - ../../../src/nfc - PUBLIC_LIBRARIES - Qt::NfcPrivate - TESTDATA ${test_data} -) - -#### Keys ignored in scope 1:.:.:qnearfieldmanager.pro:<TRUE>: -# _REQUIREMENTS = "contains(QT_CONFIG, private_tests)" - -## Scopes: -##################################################################### - -qt_internal_extend_target(tst_qnearfieldmanager CONDITION builtin_testdata - DEFINES - BUILTIN_TESTDATA -) diff --git a/tests/auto/qnearfieldmanager/CMakeLists.txt b/tests/auto/qnearfieldmanager/CMakeLists.txt index fddc0ec3..14bb41f2 100644 --- a/tests/auto/qnearfieldmanager/CMakeLists.txt +++ b/tests/auto/qnearfieldmanager/CMakeLists.txt @@ -1,18 +1,14 @@ -# Generated from qnearfieldmanager.pro. - -# special case begin if (NOT QT_FEATURE_private_tests) return() endif() -# special case end ##################################################################### ## tst_qnearfieldmanager Test: ##################################################################### # Collect test data -list(APPEND test_data "../nfcdata/Qt Labs Website Tag Type1.nfc") # special case -list(APPEND test_data "../nfcdata/Qt Website Tag Type1.nfc") # special case +list(APPEND test_data "../nfcdata/Qt Labs Website Tag Type1.nfc") +list(APPEND test_data "../nfcdata/Qt Website Tag Type1.nfc") qt_internal_add_test(tst_qnearfieldmanager SOURCES diff --git a/tests/auto/qnearfieldmanager/qnearfieldmanager.pro b/tests/auto/qnearfieldmanager/qnearfieldmanager.pro deleted file mode 100644 index 00939b34..00000000 --- a/tests/auto/qnearfieldmanager/qnearfieldmanager.pro +++ /dev/null @@ -1,27 +0,0 @@ -requires(contains(QT_CONFIG, private_tests)) - -SOURCES += tst_qnearfieldmanager.cpp -TARGET = tst_qnearfieldmanager -CONFIG += testcase - -QT = core nfc-private testlib - -INCLUDEPATH += ../../../src/nfc -VPATH += ../../../src/nfc - -HEADERS += \ - qnearfieldmanager_emulator_p.h \ - qnearfieldtarget_emulator_p.h \ - targetemulator_p.h - -SOURCES += \ - qnearfieldmanager_emulator.cpp \ - qnearfieldtarget_emulator.cpp \ - targetemulator.cpp - -DEFINES += SRCDIR=\\\"$$PWD/../nfcdata\\\" - -TESTDATA += "$$PWD/../nfcdata/Qt Labs Website Tag Type1.nfc" \ - "$$PWD/../nfcdata/Qt Website Tag Type1.nfc" - -builtin_testdata: DEFINES += BUILTIN_TESTDATA diff --git a/tests/auto/qnearfieldtagtype1/.prev_CMakeLists.txt b/tests/auto/qnearfieldtagtype1/.prev_CMakeLists.txt deleted file mode 100644 index e55a45e5..00000000 --- a/tests/auto/qnearfieldtagtype1/.prev_CMakeLists.txt +++ /dev/null @@ -1,39 +0,0 @@ -# Generated from qnearfieldtagtype1.pro. - -if(NOT QT_CONFIG___contains___private_tests) - return() -endif() - -##################################################################### -## tst_qnearfieldtagtype1 Test: -##################################################################### - -# Collect test data -list(APPEND test_data "${CMAKE_CURRENT_SOURCE_DIR}/../nfcdata/Qt Labs Website Tag Type1.nfc") -list(APPEND test_data "${CMAKE_CURRENT_SOURCE_DIR}/../nfcdata/Qt Website Tag Type1.nfc") - -qt_internal_add_test(tst_qnearfieldtagtype1 - SOURCES - ../../../src/nfc/qnearfieldmanager_emulator.cpp ../../../src/nfc/qnearfieldmanager_emulator_p.h - ../../../src/nfc/qnearfieldtarget_emulator.cpp ../../../src/nfc/qnearfieldtarget_emulator_p.h - ../../../src/nfc/targetemulator.cpp ../../../src/nfc/targetemulator_p.h - tst_qnearfieldtagtype1.cpp - DEFINES - SRCDIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../nfcdata\\\" - INCLUDE_DIRECTORIES - ../../../src/nfc - PUBLIC_LIBRARIES - Qt::NfcPrivate - TESTDATA ${test_data} -) - -#### Keys ignored in scope 1:.:.:qnearfieldtagtype1.pro:<TRUE>: -# _REQUIREMENTS = "contains(QT_CONFIG, private_tests)" - -## Scopes: -##################################################################### - -qt_internal_extend_target(tst_qnearfieldtagtype1 CONDITION builtin_testdata - DEFINES - BUILTIN_TESTDATA -) diff --git a/tests/auto/qnearfieldtagtype1/CMakeLists.txt b/tests/auto/qnearfieldtagtype1/CMakeLists.txt index d93e76c9..00254f70 100644 --- a/tests/auto/qnearfieldtagtype1/CMakeLists.txt +++ b/tests/auto/qnearfieldtagtype1/CMakeLists.txt @@ -1,18 +1,14 @@ -# Generated from qnearfieldtagtype1.pro. - -# special case begin if (NOT QT_FEATURE_private_tests) return() endif() -# special case end ##################################################################### ## tst_qnearfieldtagtype1 Test: ##################################################################### # Collect test data -list(APPEND test_data "../nfcdata/Qt Labs Website Tag Type1.nfc") # special case -list(APPEND test_data "../nfcdata/Qt Website Tag Type1.nfc") # special case +list(APPEND test_data "../nfcdata/Qt Labs Website Tag Type1.nfc") +list(APPEND test_data "../nfcdata/Qt Website Tag Type1.nfc") qt_internal_add_test(tst_qnearfieldtagtype1 SOURCES diff --git a/tests/auto/qnearfieldtagtype1/qnearfieldtagtype1.pro b/tests/auto/qnearfieldtagtype1/qnearfieldtagtype1.pro deleted file mode 100644 index af4d92d8..00000000 --- a/tests/auto/qnearfieldtagtype1/qnearfieldtagtype1.pro +++ /dev/null @@ -1,27 +0,0 @@ -requires(contains(QT_CONFIG, private_tests)) - -SOURCES += tst_qnearfieldtagtype1.cpp -TARGET = tst_qnearfieldtagtype1 -CONFIG += testcase - -QT = core nfc-private testlib - -INCLUDEPATH += ../../../src/nfc -VPATH += ../../../src/nfc - -HEADERS += \ - qnearfieldmanager_emulator_p.h \ - qnearfieldtarget_emulator_p.h \ - targetemulator_p.h - -SOURCES += \ - qnearfieldmanager_emulator.cpp \ - qnearfieldtarget_emulator.cpp \ - targetemulator.cpp - -DEFINES += SRCDIR=\\\"$$PWD/../nfcdata\\\" - -TESTDATA += "$$PWD/../nfcdata/Qt Labs Website Tag Type1.nfc" \ - "$$PWD/../nfcdata/Qt Website Tag Type1.nfc" - -builtin_testdata: DEFINES += BUILTIN_TESTDATA diff --git a/tests/auto/qnearfieldtagtype2/.prev_CMakeLists.txt b/tests/auto/qnearfieldtagtype2/.prev_CMakeLists.txt deleted file mode 100644 index 1fb0f9b8..00000000 --- a/tests/auto/qnearfieldtagtype2/.prev_CMakeLists.txt +++ /dev/null @@ -1,39 +0,0 @@ -# Generated from qnearfieldtagtype2.pro. - -if(NOT QT_CONFIG___contains___private_tests) - return() -endif() - -##################################################################### -## tst_qnearfieldtagtype2 Test: -##################################################################### - -# Collect test data -list(APPEND test_data "${CMAKE_CURRENT_SOURCE_DIR}/nfcdata/Dynamic Empty Tag.nfc") -list(APPEND test_data "${CMAKE_CURRENT_SOURCE_DIR}/nfcdata/Empty Tag.nfc") - -qt_internal_add_test(tst_qnearfieldtagtype2 - SOURCES - ../../../src/nfc/qnearfieldmanager_emulator.cpp ../../../src/nfc/qnearfieldmanager_emulator_p.h - ../../../src/nfc/qnearfieldtarget_emulator.cpp ../../../src/nfc/qnearfieldtarget_emulator_p.h - ../../../src/nfc/targetemulator.cpp ../../../src/nfc/targetemulator_p.h - tst_qnearfieldtagtype2.cpp - DEFINES - SRCDIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/nfcdata\\\" - INCLUDE_DIRECTORIES - ../../../src/nfc - PUBLIC_LIBRARIES - Qt::NfcPrivate - TESTDATA ${test_data} -) - -#### Keys ignored in scope 1:.:.:qnearfieldtagtype2.pro:<TRUE>: -# _REQUIREMENTS = "contains(QT_CONFIG, private_tests)" - -## Scopes: -##################################################################### - -qt_internal_extend_target(tst_qnearfieldtagtype2 CONDITION builtin_testdata - DEFINES - BUILTIN_TESTDATA -) diff --git a/tests/auto/qnearfieldtagtype2/CMakeLists.txt b/tests/auto/qnearfieldtagtype2/CMakeLists.txt index 32315f03..c07238ef 100644 --- a/tests/auto/qnearfieldtagtype2/CMakeLists.txt +++ b/tests/auto/qnearfieldtagtype2/CMakeLists.txt @@ -1,18 +1,14 @@ -# Generated from qnearfieldtagtype2.pro. - -# special case begin if (NOT QT_FEATURE_private_tests) return() endif() -# special case end ##################################################################### ## tst_qnearfieldtagtype2 Test: ##################################################################### # Collect test data -list(APPEND test_data "nfcdata/Dynamic Empty Tag.nfc") # special case -list(APPEND test_data "nfcdata/Empty Tag.nfc") # special case +list(APPEND test_data "nfcdata/Dynamic Empty Tag.nfc") +list(APPEND test_data "nfcdata/Empty Tag.nfc") qt_internal_add_test(tst_qnearfieldtagtype2 SOURCES diff --git a/tests/auto/qnearfieldtagtype2/qnearfieldtagtype2.pro b/tests/auto/qnearfieldtagtype2/qnearfieldtagtype2.pro deleted file mode 100644 index d4e9ad38..00000000 --- a/tests/auto/qnearfieldtagtype2/qnearfieldtagtype2.pro +++ /dev/null @@ -1,27 +0,0 @@ -requires(contains(QT_CONFIG, private_tests)) - -SOURCES += tst_qnearfieldtagtype2.cpp -TARGET = tst_qnearfieldtagtype2 -CONFIG += testcase - -QT = core nfc-private testlib - -INCLUDEPATH += ../../../src/nfc -VPATH += ../../../src/nfc - -HEADERS += \ - qnearfieldtarget_emulator_p.h \ - qnearfieldmanager_emulator_p.h \ - targetemulator_p.h - -SOURCES += \ - qnearfieldtarget_emulator.cpp \ - qnearfieldmanager_emulator.cpp \ - targetemulator.cpp - -DEFINES += SRCDIR=\\\"$$PWD/nfcdata\\\" - -TESTDATA += "$$PWD/nfcdata/Dynamic Empty Tag.nfc" \ - "$$PWD/nfcdata/Empty Tag.nfc" - -builtin_testdata: DEFINES += BUILTIN_TESTDATA diff --git a/tests/bttestui/CMakeLists.txt b/tests/bttestui/CMakeLists.txt index 33000080..fbc47287 100644 --- a/tests/bttestui/CMakeLists.txt +++ b/tests/bttestui/CMakeLists.txt @@ -1,5 +1,3 @@ -# Generated from bttestui.pro. - ##################################################################### ## bttestui Binary: ##################################################################### diff --git a/tests/bttestui/bttestui.pro b/tests/bttestui/bttestui.pro deleted file mode 100644 index ce582e66..00000000 --- a/tests/bttestui/bttestui.pro +++ /dev/null @@ -1,18 +0,0 @@ -TARGET = bttestui -TEMPLATE = app - -SOURCES += main.cpp \ - btlocaldevice.cpp - -QT += quick bluetooth - -android: QT += androidextras - -OTHER_FILES += main.qml \ - Button.qml - -RESOURCES += \ - bttest.qrc - -HEADERS += \ - btlocaldevice.h diff --git a/tests/tests.pro b/tests/tests.pro deleted file mode 100644 index e96b928c..00000000 --- a/tests/tests.pro +++ /dev/null @@ -1,4 +0,0 @@ -TEMPLATE = subdirs -SUBDIRS += auto - -qtHaveModule(bluetooth):qtHaveModule(quick): SUBDIRS += bttestui |