Update CMake scripts in QtConnectivity

Recreated all CMake files in QtConnectivity using
run_pro2cmake.py . --only-existing -- --api-version 3
Furthermore, port bttestui to CMake.

Change-Id: Idb55f1b4c1cff30d7824a42e3ee6923c39e698df
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
This commit is contained in:
Andreas Buhr 2020-12-17 19:19:18 +01:00
parent 5f84f4e90d
commit 7059487ccb
60 changed files with 297 additions and 121 deletions

View File

@ -12,9 +12,9 @@ project(QtConnectivity # special case
# special case begin
set(QT_REPO_NOT_WARNINGS_CLEAN TRUE)
find_package(Qt6 ${PROJECT_VERSION} CONFIG REQUIRED COMPONENTS BuildInternals Core Gui Network
Concurrent Widgets)
find_package(Qt6 ${PROJECT_VERSION} CONFIG OPTIONAL_COMPONENTS DBus)
find_package(Qt6 ${PROJECT_VERSION} CONFIG REQUIRED COMPONENTS BuildInternals Core Network
Concurrent)
find_package(Qt6 ${PROJECT_VERSION} CONFIG OPTIONAL_COMPONENTS DBus Gui Widgets Quick)
if(ANDROID)
find_package(Qt6 ${PROJECT_VERSION} CONFIG REQUIRED COMPONENTS AndroidExtras)
endif()

View File

@ -1,7 +1,22 @@
# Generated from bluez.pro.
cmake_minimum_required(VERSION 3.14.0)
project(config_test_bluez LANGUAGES CXX)
project(config_test_bluez LANGUAGES C CXX)
foreach(p ${QT_CONFIG_COMPILE_TEST_PACKAGES})
find_package(${p})
endforeach()
if(QT_CONFIG_COMPILE_TEST_LIBRARIES)
link_libraries(${QT_CONFIG_COMPILE_TEST_LIBRARIES})
endif()
if(QT_CONFIG_COMPILE_TEST_LIBRARY_TARGETS)
foreach(lib ${QT_CONFIG_COMPILE_TEST_LIBRARY_TARGETS})
if(TARGET ${lib})
link_libraries(${lib})
endif()
endforeach()
endif()
add_executable(${PROJECT_NAME}
main.cpp

View File

@ -1,7 +1,22 @@
# Generated from bluez_le.pro.
cmake_minimum_required(VERSION 3.14.0)
project(config_test_bluez_le LANGUAGES CXX)
project(config_test_bluez_le LANGUAGES C CXX)
foreach(p ${QT_CONFIG_COMPILE_TEST_PACKAGES})
find_package(${p})
endforeach()
if(QT_CONFIG_COMPILE_TEST_LIBRARIES)
link_libraries(${QT_CONFIG_COMPILE_TEST_LIBRARIES})
endif()
if(QT_CONFIG_COMPILE_TEST_LIBRARY_TARGETS)
foreach(lib ${QT_CONFIG_COMPILE_TEST_LIBRARY_TARGETS})
if(TARGET ${lib})
link_libraries(${lib})
endif()
endforeach()
endif()
add_executable(${PROJECT_NAME}
main.cpp

View File

@ -1,7 +1,22 @@
# Generated from linux_crypto_api.pro.
cmake_minimum_required(VERSION 3.14.0)
project(config_test_linux_crypto_api LANGUAGES CXX)
project(config_test_linux_crypto_api LANGUAGES C CXX)
foreach(p ${QT_CONFIG_COMPILE_TEST_PACKAGES})
find_package(${p})
endforeach()
if(QT_CONFIG_COMPILE_TEST_LIBRARIES)
link_libraries(${QT_CONFIG_COMPILE_TEST_LIBRARIES})
endif()
if(QT_CONFIG_COMPILE_TEST_LIBRARY_TARGETS)
foreach(lib ${QT_CONFIG_COMPILE_TEST_LIBRARY_TARGETS})
if(TARGET ${lib})
link_libraries(${lib})
endif()
endforeach()
endif()
add_executable(${PROJECT_NAME}
main.cpp

View File

@ -1,14 +1,26 @@
# Generated from winrt.pro.
cmake_minimum_required(VERSION 3.14.0)
project(config_test_winrt LANGUAGES CXX)
project(config_test_winrt LANGUAGES C CXX)
foreach(p ${QT_CONFIG_COMPILE_TEST_PACKAGES})
find_package(${p})
endforeach()
if(QT_CONFIG_COMPILE_TEST_LIBRARIES)
link_libraries(${QT_CONFIG_COMPILE_TEST_LIBRARIES})
endif()
if(QT_CONFIG_COMPILE_TEST_LIBRARY_TARGETS)
foreach(lib ${QT_CONFIG_COMPILE_TEST_LIBRARY_TARGETS})
if(TARGET ${lib})
link_libraries(${lib})
endif()
endforeach()
endif()
add_executable(${PROJECT_NAME}
main.cpp
)
if(NOT WINRT)
target_link_libraries(${PROJECT_NAME} PUBLIC
runtimeobject.lib
)
endif()
target_link_libraries(${PROJECT_NAME} PUBLIC
runtimeobject.lib
)

View File

@ -1,14 +1,26 @@
# Generated from winrt.pro.
cmake_minimum_required(VERSION 3.14.0)
project(config_test_winrt LANGUAGES CXX)
project(config_test_winrt LANGUAGES C CXX)
foreach(p ${QT_CONFIG_COMPILE_TEST_PACKAGES})
find_package(${p})
endforeach()
if(QT_CONFIG_COMPILE_TEST_LIBRARIES)
link_libraries(${QT_CONFIG_COMPILE_TEST_LIBRARIES})
endif()
if(QT_CONFIG_COMPILE_TEST_LIBRARY_TARGETS)
foreach(lib ${QT_CONFIG_COMPILE_TEST_LIBRARY_TARGETS})
if(TARGET ${lib})
link_libraries(${lib})
endif()
endforeach()
endif()
add_executable(${PROJECT_NAME}
main.cpp
)
if(NOT WINRT)
target_link_libraries(${PROJECT_NAME} PUBLIC
runtimeobject.lib
)
endif()
target_link_libraries(${PROJECT_NAME} PUBLIC
runtimeobject.lib
)

View File

@ -1,7 +1,7 @@
dependencies:
../qtandroidextras:
ref: 1c906fab0d04341c8abed762c641231f44c6d8f3
ref: c3c4ac40441aae499ba7d4082b3e643dfd0a0f21
required: false
../qtdeclarative:
ref: d16e62d81587e98b054af4f66c02959c5bb89ff6
ref: 31211f1415f221ed1a974663fdde117fd6de357d
required: false

View File

@ -26,6 +26,10 @@ qt_add_executable(btchat
main.cpp
remoteselector.cpp remoteselector.h remoteselector.ui
)
set_target_properties(btchat PROPERTIES
WIN32_EXECUTABLE TRUE
MACOSX_BUNDLE TRUE
)
target_link_libraries(btchat PUBLIC
Qt::Bluetooth
Qt::Core

View File

@ -25,6 +25,10 @@ qt_add_executable(btfiletransfer
progress.cpp progress.h progress.ui
remoteselector.cpp remoteselector.h remoteselector.ui
)
set_target_properties(btfiletransfer PROPERTIES
WIN32_EXECUTABLE TRUE
MACOSX_BUNDLE TRUE
)
target_link_libraries(btfiletransfer PUBLIC
Qt::Bluetooth
Qt::Core

View File

@ -24,6 +24,10 @@ qt_add_executable(btscanner
main.cpp
service.cpp service.h service.ui
)
set_target_properties(btscanner PROPERTIES
WIN32_EXECUTABLE TRUE
MACOSX_BUNDLE TRUE
)
target_link_libraries(btscanner PUBLIC
Qt::Bluetooth
Qt::Core

View File

@ -22,6 +22,10 @@ find_package(Qt6 COMPONENTS Quick)
qt_add_executable(qml_chat
qmlchat.cpp
)
set_target_properties(qml_chat PROPERTIES
WIN32_EXECUTABLE TRUE
MACOSX_BUNDLE TRUE
)
target_link_libraries(qml_chat PUBLIC
Qt::Bluetooth
Qt::Core

View File

@ -30,6 +30,10 @@ qt_add_executable(heartrate-game
heartrate-global.h
main.cpp
)
set_target_properties(heartrate-game PROPERTIES
WIN32_EXECUTABLE TRUE
MACOSX_BUNDLE TRUE
)
target_link_libraries(heartrate-game PUBLIC
Qt::Bluetooth
Qt::Core

View File

@ -21,6 +21,10 @@ find_package(Qt6 COMPONENTS Bluetooth)
qt_add_executable(heartrate-server
main.cpp
)
set_target_properties(heartrate-server PROPERTIES
WIN32_EXECUTABLE TRUE
MACOSX_BUNDLE TRUE
)
target_link_libraries(heartrate-server PUBLIC
Qt::Bluetooth
Qt::Core

View File

@ -27,6 +27,10 @@ qt_add_executable(lowenergyscanner
main.cpp
serviceinfo.cpp serviceinfo.h
)
set_target_properties(lowenergyscanner PROPERTIES
WIN32_EXECUTABLE TRUE
MACOSX_BUNDLE TRUE
)
target_include_directories(lowenergyscanner PUBLIC
.
)

View File

@ -24,6 +24,10 @@ qt_add_executable(qml_picturetransfer
filetransfer.cpp filetransfer.h
main.cpp
)
set_target_properties(qml_picturetransfer PROPERTIES
WIN32_EXECUTABLE TRUE
MACOSX_BUNDLE TRUE
)
target_link_libraries(qml_picturetransfer PUBLIC
Qt::Bluetooth
Qt::Core

View File

@ -24,6 +24,10 @@ qt_add_executable(pingpong
main.cpp
pingpong.cpp pingpong.h
)
set_target_properties(pingpong PROPERTIES
WIN32_EXECUTABLE TRUE
MACOSX_BUNDLE TRUE
)
target_link_libraries(pingpong PUBLIC
Qt::Bluetooth
Qt::Core

View File

@ -22,6 +22,10 @@ find_package(Qt6 COMPONENTS Quick)
qt_add_executable(qml_scanner
qmlscanner.cpp
)
set_target_properties(qml_scanner PROPERTIES
WIN32_EXECUTABLE TRUE
MACOSX_BUNDLE TRUE
)
target_link_libraries(qml_scanner PUBLIC
Qt::Bluetooth
Qt::Core

View File

@ -25,6 +25,10 @@ qt_add_executable(annotatedurl
main.cpp
mainwindow.cpp mainwindow.h mainwindow.ui
)
set_target_properties(annotatedurl PROPERTIES
WIN32_EXECUTABLE TRUE
MACOSX_BUNDLE TRUE
)
target_link_libraries(annotatedurl PUBLIC
Qt::Core
Qt::Gui

View File

@ -27,6 +27,10 @@ qt_add_executable(ndefeditor
textrecordeditor.cpp textrecordeditor.h textrecordeditor.ui
urirecordeditor.cpp urirecordeditor.h urirecordeditor.ui
)
set_target_properties(ndefeditor PROPERTIES
WIN32_EXECUTABLE TRUE
MACOSX_BUNDLE TRUE
)
target_link_libraries(ndefeditor PUBLIC
Qt::Core
Qt::Gui

10
src/.prev_CMakeLists.txt Normal file
View File

@ -0,0 +1,10 @@
# Generated from src.pro.
add_subdirectory(bluetooth)
add_subdirectory(nfc)
if(ANDROID)
add_subdirectory(android)
endif()
if(TARGET Qt::Quick)
add_subdirectory(imports)
endif()

View File

@ -9,6 +9,9 @@ if(TARGET Qt::Quick)
add_subdirectory(imports)
endif()
# special case begin
if(QT_FEATURE_bluez)
add_subdirectory(tools/sdpscanner)
endif()
# special case end

View File

@ -4,7 +4,7 @@
## Bluetooth Module:
#####################################################################
qt_add_module(Bluetooth
qt_internal_add_module(Bluetooth
SOURCES
lecmaccalculator_p.h
qbluetooth.cpp qbluetooth.h
@ -60,7 +60,7 @@ qt_add_module(Bluetooth
# WINDOWS_SDK_VERSION = "$$member($$list $$split WINDOWS_SDK_VERSION_STRING, . , 2)"
# WINDOWS_SDK_VERSION_STRING = "$$(WindowsSDKVersion)"
qt_extend_target(Bluetooth CONDITION QT_FEATURE_bluez
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
@ -106,7 +106,7 @@ qt_extend_target(Bluetooth CONDITION QT_FEATURE_bluez
Qt::DBus
)
qt_extend_target(Bluetooth CONDITION QT_FEATURE_bluez AND QT_FEATURE_bluez_le
qt_internal_extend_target(Bluetooth CONDITION QT_FEATURE_bluez AND QT_FEATURE_bluez_le
SOURCES
lecmaccalculator.cpp
qleadvertiser_bluez.cpp
@ -114,12 +114,12 @@ qt_extend_target(Bluetooth CONDITION QT_FEATURE_bluez AND QT_FEATURE_bluez_le
qlowenergycontroller_bluezdbus.cpp qlowenergycontroller_bluezdbus_p.h
)
qt_extend_target(Bluetooth CONDITION QT_FEATURE_bluez AND QT_FEATURE_bluez_le AND QT_FEATURE_linux_crypto_api
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_extend_target(Bluetooth CONDITION QT_FEATURE_bluez AND NOT QT_FEATURE_bluez_le
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
@ -136,7 +136,7 @@ if(ANDROID AND (ANDROID AND NOT ANDROID_EMBEDDED))
)
endif()
qt_extend_target(Bluetooth CONDITION ANDROID AND NOT ANDROID_EMBEDDED AND NOT QT_FEATURE_bluez
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
@ -163,7 +163,7 @@ qt_extend_target(Bluetooth CONDITION ANDROID AND NOT ANDROID_EMBEDDED AND NOT QT
Qt::CorePrivate
)
qt_extend_target(Bluetooth CONDITION MACOS AND NOT QT_FEATURE_bluez AND (ANDROID_EMBEDDED OR NOT ANDROID)
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
@ -199,7 +199,7 @@ qt_extend_target(Bluetooth CONDITION MACOS AND NOT QT_FEATURE_bluez AND (ANDROID
Qt::Concurrent
)
qt_extend_target(Bluetooth CONDITION NOT MACOS AND NOT QT_FEATURE_bluez AND (IOS OR TVOS) AND (ANDROID_EMBEDDED OR NOT ANDROID)
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
@ -223,12 +223,12 @@ qt_extend_target(Bluetooth CONDITION NOT MACOS AND NOT QT_FEATURE_bluez AND (IOS
${FWFoundation}
)
qt_extend_target(Bluetooth CONDITION IOS AND NOT MACOS AND NOT QT_FEATURE_bluez AND (ANDROID_EMBEDDED OR NOT ANDROID)
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_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)
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
@ -250,18 +250,18 @@ qt_extend_target(Bluetooth CONDITION QT_FEATURE_winrt_bt AND NOT IOS AND NOT MAC
Qt::CorePrivate
)
qt_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)
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_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)
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_extend_target(Bluetooth CONDITION WIN32 AND NOT QT_FEATURE_bluez AND NOT QT_FEATURE_winrt_bt AND (ANDROID_EMBEDDED OR NOT ANDROID)
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
@ -281,7 +281,7 @@ qt_extend_target(Bluetooth CONDITION WIN32 AND NOT QT_FEATURE_bluez AND NOT QT_F
ws2_32
)
qt_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)
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
@ -292,7 +292,7 @@ qt_extend_target(Bluetooth CONDITION UNIX AND NOT IOS AND NOT MACOS AND NOT QT_F
qbluetoothsocket_dummy.cpp qbluetoothsocket_dummy_p.h
qlowenergycontroller_dummy.cpp qlowenergycontroller_dummy_p.h
)
qt_add_docs(Bluetooth
qt_internal_add_docs(Bluetooth
doc/qtbluetooth.qdocconf
)

View File

@ -4,7 +4,7 @@
## Bluetooth Module:
#####################################################################
qt_add_module(Bluetooth
qt_internal_add_module(Bluetooth
SOURCES
lecmaccalculator_p.h
qbluetooth.cpp qbluetooth.h
@ -84,7 +84,7 @@ extend_target(Bluetooth CONDITION WIN32 AND WINDOWS_SDK_VERSION_PATCH LESS 14393
)
# special case end
qt_extend_target(Bluetooth CONDITION QT_FEATURE_bluez
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
@ -125,12 +125,11 @@ qt_extend_target(Bluetooth CONDITION QT_FEATURE_bluez
qbluetoothtransferreply_bluez.cpp qbluetoothtransferreply_bluez_p.h
LIBRARIES
Qt::Concurrent
Qt::DBus
PRIVATE_MODULE_INTERFACE
Qt::DBus
PUBLIC_LIBRARIES # special case for Linux QEMU (gcc-armv7) on Linux Ubuntu_20_04 (gcc-x86_64)
Qt::DBus # special case
)
qt_extend_target(Bluetooth CONDITION QT_FEATURE_bluez AND QT_FEATURE_bluez_le
qt_internal_extend_target(Bluetooth CONDITION QT_FEATURE_bluez AND QT_FEATURE_bluez_le
SOURCES
lecmaccalculator.cpp
qleadvertiser_bluez.cpp
@ -138,12 +137,12 @@ qt_extend_target(Bluetooth CONDITION QT_FEATURE_bluez AND QT_FEATURE_bluez_le
qlowenergycontroller_bluezdbus.cpp qlowenergycontroller_bluezdbus_p.h
)
qt_extend_target(Bluetooth CONDITION QT_FEATURE_bluez AND QT_FEATURE_bluez_le AND QT_FEATURE_linux_crypto_api
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_extend_target(Bluetooth CONDITION QT_FEATURE_bluez AND NOT QT_FEATURE_bluez_le
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
@ -160,7 +159,7 @@ if(ANDROID AND (ANDROID AND NOT ANDROID_EMBEDDED))
)
endif()
qt_extend_target(Bluetooth CONDITION ANDROID AND NOT ANDROID_EMBEDDED AND NOT QT_FEATURE_bluez
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
@ -187,7 +186,7 @@ qt_extend_target(Bluetooth CONDITION ANDROID AND NOT ANDROID_EMBEDDED AND NOT QT
Qt::CorePrivate
)
qt_extend_target(Bluetooth CONDITION MACOS AND NOT QT_FEATURE_bluez AND (ANDROID_EMBEDDED OR NOT ANDROID)
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
@ -223,7 +222,7 @@ qt_extend_target(Bluetooth CONDITION MACOS AND NOT QT_FEATURE_bluez AND (ANDROID
Qt::Concurrent
)
qt_extend_target(Bluetooth CONDITION NOT MACOS AND NOT QT_FEATURE_bluez AND (IOS OR TVOS) AND (ANDROID_EMBEDDED OR NOT ANDROID)
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
@ -247,12 +246,12 @@ qt_extend_target(Bluetooth CONDITION NOT MACOS AND NOT QT_FEATURE_bluez AND (IOS
${FWFoundation}
)
qt_extend_target(Bluetooth CONDITION IOS AND NOT MACOS AND NOT QT_FEATURE_bluez AND (ANDROID_EMBEDDED OR NOT ANDROID)
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_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)
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
@ -274,7 +273,7 @@ qt_extend_target(Bluetooth CONDITION QT_FEATURE_winrt_bt AND NOT IOS AND NOT MAC
Qt::CorePrivate
)
qt_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)
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
)
@ -287,7 +286,7 @@ qt_extend_target(Bluetooth CONDITION QT_FEATURE_winrt_bt AND QT_FEATURE_winrt_bt
# )
# special case end
qt_extend_target(Bluetooth CONDITION WIN32 AND NOT QT_FEATURE_bluez AND NOT QT_FEATURE_winrt_bt AND (ANDROID_EMBEDDED OR NOT ANDROID)
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
@ -307,7 +306,7 @@ qt_extend_target(Bluetooth CONDITION WIN32 AND NOT QT_FEATURE_bluez AND NOT QT_F
ws2_32
)
qt_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)
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
@ -319,7 +318,7 @@ qt_extend_target(Bluetooth CONDITION UNIX AND NOT IOS AND NOT MACOS AND NOT QT_F
qlowenergycontroller_dummy.cpp qlowenergycontroller_dummy_p.h
)
qt_add_docs(Bluetooth
qt_internal_add_docs(Bluetooth
doc/qtbluetooth.qdocconf
)

View File

@ -4,7 +4,7 @@
## bluetooth Plugin:
#####################################################################
qt_add_qml_module(bluetooth
qt_internal_add_qml_module(bluetooth
URI "QtBluetooth"
VERSION "${CMAKE_PROJECT_VERSION}"
CLASSNAME QBluetoothQmlPlugin

View File

@ -4,7 +4,7 @@
## bluetooth Plugin:
#####################################################################
qt_add_qml_module(declarative_bluetooth # special case
qt_internal_add_qml_module(declarative_bluetooth # special case
URI "QtBluetooth"
VERSION "${CMAKE_PROJECT_VERSION}"
CLASSNAME QBluetoothQmlPlugin

View File

@ -4,7 +4,7 @@
## Nfc Module:
#####################################################################
qt_add_module(Nfc
qt_internal_add_module(Nfc
SOURCES
qndeffilter.cpp qndeffilter.h
qndefmessage.cpp qndefmessage.h
@ -40,7 +40,7 @@ if(ANDROID AND (ANDROID AND NOT ANDROID_EMBEDDED))
)
endif()
qt_extend_target(Nfc CONDITION ANDROID AND NOT ANDROID_EMBEDDED
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
@ -58,11 +58,11 @@ qt_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"
qt_extend_target(Nfc CONDITION NFC_BACKEND_AVAILABLE_ISEMPTY
qt_internal_extend_target(Nfc CONDITION NFC_BACKEND_AVAILABLE_ISEMPTY
SOURCES
qnearfieldmanager_generic.cpp qnearfieldmanager_generic_p.h
)
qt_add_docs(Nfc
qt_internal_add_docs(Nfc
doc/qtnfc.qdocconf
)

View File

@ -4,7 +4,7 @@
## Nfc Module:
#####################################################################
qt_add_module(Nfc
qt_internal_add_module(Nfc
SOURCES
qndeffilter.cpp qndeffilter.h
qndefmessage.cpp qndefmessage.h
@ -41,7 +41,7 @@ if(ANDROID AND (ANDROID AND NOT ANDROID_EMBEDDED))
set(NFC_BACKEND_AVAILABLE ON) # special case
endif()
qt_extend_target(Nfc CONDITION ANDROID AND NOT ANDROID_EMBEDDED
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
@ -60,13 +60,13 @@ qt_extend_target(Nfc CONDITION ANDROID AND NOT ANDROID_EMBEDDED
# NFC_BACKEND_AVAILABLE = "yes"
# special case begin
# qt_extend_target(Nfc CONDITION NFC_BACKEND_AVAILABLE_ISEMPTY
qt_extend_target(Nfc CONDITION NOT NFC_BACKEND_AVAILABLE
# 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
)
qt_add_docs(Nfc
qt_internal_add_docs(Nfc
doc/qtnfc.qdocconf
)

View File

@ -5,7 +5,7 @@
#####################################################################
qt_get_tool_target_name(target_name sdpscanner)
qt_add_tool(${target_name}
qt_internal_add_tool(${target_name}
SOURCES
main.cpp
PUBLIC_LIBRARIES

View File

@ -12,7 +12,7 @@ endif()
qt_get_tool_target_name(target_name sdpscanner)
qt_add_tool(${target_name}
qt_internal_add_tool(${target_name}
TOOLS_TARGET Bluetooth # special case
SOURCES
main.cpp

View File

@ -1,10 +1,7 @@
# Generated from tests.pro.
if(NOT TARGET Qt::Test)
cmake_minimum_required(VERSION 3.15.0)
project(connectivityTests_FIXME VERSION 6.0.0 LANGUAGES C CXX)
find_package(Qt6 ${PROJECT_VERSION} REQUIRED COMPONENTS BuildInternals Core SET_ME_TO_SOMETHING_USEFUL)
find_package(Qt6 ${PROJECT_VERSION} OPTIONAL_COMPONENTS SET_ME_TO_SOMETHING_USEFUL)
qt_set_up_standalone_tests_build()
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()

View File

@ -2,9 +2,16 @@
if(NOT TARGET Qt::Test)
cmake_minimum_required(VERSION 3.15.0)
project(QtConnectivityTests VERSION 6.0.0 LANGUAGES C CXX)
find_package(Qt6 REQUIRED COMPONENTS BuildInternals Core Gui Concurrent Bluetooth Nfc Test
Network Widgets)
find_package(Qt6 REQUIRED COMPONENTS BuildInternals Core Concurrent Bluetooth Nfc Test
Network)
find_package(Qt6 OPTIONAL_COMPONENTS Gui Widgets)
qt_set_up_standalone_tests_build()
endif()
if(TARGET Qt::Bluetooth)
if(TARGET Qt::Quick)
add_subdirectory(bttestui)
endif()
endif()
# special case end
qt_build_tests()

View File

@ -4,7 +4,7 @@
## tst_qbluetoothaddress Test:
#####################################################################
qt_add_test(tst_qbluetoothaddress
qt_internal_add_test(tst_qbluetoothaddress
SOURCES
tst_qbluetoothaddress.cpp
PUBLIC_LIBRARIES

View File

@ -4,7 +4,7 @@
## tst_qbluetoothdevicediscoveryagent Test:
#####################################################################
qt_add_test(tst_qbluetoothdevicediscoveryagent
qt_internal_add_test(tst_qbluetoothdevicediscoveryagent
SOURCES
tst_qbluetoothdevicediscoveryagent.cpp
PUBLIC_LIBRARIES
@ -15,7 +15,7 @@ qt_add_test(tst_qbluetoothdevicediscoveryagent
## Scopes:
#####################################################################
qt_extend_target(tst_qbluetoothdevicediscoveryagent CONDITION APPLE_OSX
qt_internal_extend_target(tst_qbluetoothdevicediscoveryagent CONDITION MACOS
PUBLIC_LIBRARIES
Qt::Widgets
)

View File

@ -4,7 +4,7 @@
## tst_qbluetoothdeviceinfo Test:
#####################################################################
qt_add_test(tst_qbluetoothdeviceinfo
qt_internal_add_test(tst_qbluetoothdeviceinfo
SOURCES
tst_qbluetoothdeviceinfo.cpp
PUBLIC_LIBRARIES

View File

@ -4,7 +4,7 @@
## tst_qbluetoothhostinfo Test:
#####################################################################
qt_add_test(tst_qbluetoothhostinfo
qt_internal_add_test(tst_qbluetoothhostinfo
SOURCES
tst_qbluetoothhostinfo.cpp
PUBLIC_LIBRARIES

View File

@ -4,7 +4,7 @@
## tst_qbluetoothlocaldevice Test:
#####################################################################
qt_add_test(tst_qbluetoothlocaldevice
qt_internal_add_test(tst_qbluetoothlocaldevice
SOURCES
tst_qbluetoothlocaldevice.cpp
PUBLIC_LIBRARIES
@ -15,7 +15,7 @@ qt_add_test(tst_qbluetoothlocaldevice
## Scopes:
#####################################################################
qt_extend_target(tst_qbluetoothlocaldevice CONDITION APPLE_OSX
qt_internal_extend_target(tst_qbluetoothlocaldevice CONDITION MACOS
PUBLIC_LIBRARIES
Qt::Widgets
)

View File

@ -4,7 +4,7 @@
## tst_qbluetoothserver Test:
#####################################################################
qt_add_test(tst_qbluetoothserver
qt_internal_add_test(tst_qbluetoothserver
SOURCES
tst_qbluetoothserver.cpp
PUBLIC_LIBRARIES
@ -18,7 +18,7 @@ qt_add_test(tst_qbluetoothserver
## Scopes:
#####################################################################
qt_extend_target(tst_qbluetoothserver CONDITION APPLE_OSX
qt_internal_extend_target(tst_qbluetoothserver CONDITION MACOS
PUBLIC_LIBRARIES
Qt::Widgets
)

View File

@ -4,7 +4,7 @@
## tst_qbluetoothservicediscoveryagent Test:
#####################################################################
qt_add_test(tst_qbluetoothservicediscoveryagent
qt_internal_add_test(tst_qbluetoothservicediscoveryagent
SOURCES
tst_qbluetoothservicediscoveryagent.cpp
PUBLIC_LIBRARIES
@ -15,7 +15,7 @@ qt_add_test(tst_qbluetoothservicediscoveryagent
## Scopes:
#####################################################################
qt_extend_target(tst_qbluetoothservicediscoveryagent CONDITION APPLE_OSX
qt_internal_extend_target(tst_qbluetoothservicediscoveryagent CONDITION MACOS
PUBLIC_LIBRARIES
Qt::Widgets
)

View File

@ -4,7 +4,7 @@
## tst_qbluetoothserviceinfo Test:
#####################################################################
qt_add_test(tst_qbluetoothserviceinfo
qt_internal_add_test(tst_qbluetoothserviceinfo
SOURCES
tst_qbluetoothserviceinfo.cpp
PUBLIC_LIBRARIES
@ -15,12 +15,12 @@ qt_add_test(tst_qbluetoothserviceinfo
## Scopes:
#####################################################################
qt_extend_target(tst_qbluetoothserviceinfo CONDITION APPLE_OSX
qt_internal_extend_target(tst_qbluetoothserviceinfo CONDITION MACOS
PUBLIC_LIBRARIES
Qt::Widgets
)
qt_extend_target(tst_qbluetoothserviceinfo CONDITION ANDROID AND NOT ANDROID_EMBEDDED
qt_internal_extend_target(tst_qbluetoothserviceinfo CONDITION ANDROID AND NOT ANDROID_EMBEDDED
DEFINES
QT_ANDROID_BLUETOOTH
)

View File

@ -4,7 +4,7 @@
## tst_qbluetoothsocket Test:
#####################################################################
qt_add_test(tst_qbluetoothsocket
qt_internal_add_test(tst_qbluetoothsocket
SOURCES
tst_qbluetoothsocket.cpp
PUBLIC_LIBRARIES
@ -20,14 +20,14 @@ qt_add_test(tst_qbluetoothsocket
## Scopes:
#####################################################################
qt_extend_target(tst_qbluetoothsocket CONDITION MACOS
qt_internal_extend_target(tst_qbluetoothsocket CONDITION MACOS
DEFINES
QT_OSX_BLUETOOTH
PUBLIC_LIBRARIES
Qt::Widgets
)
qt_extend_target(tst_qbluetoothsocket CONDITION ANDROID AND NOT ANDROID_EMBEDDED
qt_internal_extend_target(tst_qbluetoothsocket CONDITION ANDROID AND NOT ANDROID_EMBEDDED
DEFINES
QT_ANDROID_BLUETOOTH
)

View File

@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob
*.txt)
list(APPEND test_data ${test_data_glob})
qt_add_test(tst_qbluetoothtransfermanager
qt_internal_add_test(tst_qbluetoothtransfermanager
SOURCES
tst_qbluetoothtransfermanager.cpp
PUBLIC_LIBRARIES

View File

@ -4,7 +4,7 @@
## tst_qbluetoothtransferrequest Test:
#####################################################################
qt_add_test(tst_qbluetoothtransferrequest
qt_internal_add_test(tst_qbluetoothtransferrequest
SOURCES
tst_qbluetoothtransferrequest.cpp
PUBLIC_LIBRARIES

View File

@ -4,7 +4,7 @@
## tst_qbluetoothuuid Test:
#####################################################################
qt_add_test(tst_qbluetoothuuid
qt_internal_add_test(tst_qbluetoothuuid
SOURCES
tst_qbluetoothuuid.cpp
PUBLIC_LIBRARIES

View File

@ -4,7 +4,7 @@
## tst_qlowenergycharacteristic Test:
#####################################################################
qt_add_test(tst_qlowenergycharacteristic
qt_internal_add_test(tst_qlowenergycharacteristic
SOURCES
tst_qlowenergycharacteristic.cpp
PUBLIC_LIBRARIES

View File

@ -4,7 +4,7 @@
## server Binary:
#####################################################################
qt_add_executable(server
qt_internal_add_executable(server
GUI
SOURCES
qlowenergycontroller-gattserver.cpp

View File

@ -5,6 +5,7 @@
#####################################################################
qt_internal_add_executable(server
GUI
OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}" # special case
SOURCES
qlowenergycontroller-gattserver.cpp

View File

@ -4,7 +4,7 @@
## tst_qlowenergycontroller-gattserver Test:
#####################################################################
qt_add_test(tst_qlowenergycontroller-gattserver
qt_internal_add_test(tst_qlowenergycontroller-gattserver
SOURCES
tst_qlowenergycontroller-gattserver.cpp
PUBLIC_LIBRARIES
@ -15,17 +15,17 @@ qt_add_test(tst_qlowenergycontroller-gattserver
## Scopes:
#####################################################################
qt_extend_target(tst_qlowenergycontroller-gattserver CONDITION QT_FEATURE_linux_crypto_api
qt_internal_extend_target(tst_qlowenergycontroller-gattserver CONDITION QT_FEATURE_linux_crypto_api
DEFINES
CONFIG_LINUX_CRYPTO_API
)
qt_extend_target(tst_qlowenergycontroller-gattserver CONDITION QT_FEATURE_bluez_le
qt_internal_extend_target(tst_qlowenergycontroller-gattserver CONDITION QT_FEATURE_bluez_le
DEFINES
CONFIG_BLUEZ_LE
)
qt_extend_target(tst_qlowenergycontroller-gattserver CONDITION boot2qt
qt_internal_extend_target(tst_qlowenergycontroller-gattserver CONDITION boot2qt
DEFINES
CHECK_CMAC_SUPPORT
)

View File

@ -4,7 +4,7 @@
## tst_qlowenergycontroller Test:
#####################################################################
qt_add_test(tst_qlowenergycontroller
qt_internal_add_test(tst_qlowenergycontroller
SOURCES
tst_qlowenergycontroller.cpp
PUBLIC_LIBRARIES
@ -14,12 +14,12 @@ qt_add_test(tst_qlowenergycontroller
## Scopes:
#####################################################################
qt_extend_target(tst_qlowenergycontroller CONDITION ANDROID
qt_internal_extend_target(tst_qlowenergycontroller CONDITION ANDROID
PUBLIC_LIBRARIES
Qt::Widgets
)
qt_extend_target(tst_qlowenergycontroller CONDITION APPLE_IOS OR APPLE_OSX
qt_internal_extend_target(tst_qlowenergycontroller CONDITION IOS OR MACOS
PUBLIC_LIBRARIES
Qt::Widgets
)

View File

@ -4,7 +4,7 @@
## tst_qlowenergydescriptor Test:
#####################################################################
qt_add_test(tst_qlowenergydescriptor
qt_internal_add_test(tst_qlowenergydescriptor
SOURCES
tst_qlowenergydescriptor.cpp
PUBLIC_LIBRARIES

View File

@ -4,7 +4,7 @@
## tst_qlowenergyservice Test:
#####################################################################
qt_add_test(tst_qlowenergyservice
qt_internal_add_test(tst_qlowenergyservice
SOURCES
tst_qlowenergyservice.cpp
PUBLIC_LIBRARIES

View File

@ -4,7 +4,7 @@
## tst_qndefmessage Test:
#####################################################################
qt_add_test(tst_qndefmessage
qt_internal_add_test(tst_qndefmessage
SOURCES
tst_qndefmessage.cpp
PUBLIC_LIBRARIES

View File

@ -4,7 +4,7 @@
## tst_qndefnfcsmartposterrecord Test:
#####################################################################
qt_add_test(tst_qndefnfcsmartposterrecord
qt_internal_add_test(tst_qndefnfcsmartposterrecord
SOURCES
tst_qndefnfcsmartposterrecord.cpp
PUBLIC_LIBRARIES

View File

@ -4,7 +4,7 @@
## tst_qndefrecord Test:
#####################################################################
qt_add_test(tst_qndefrecord
qt_internal_add_test(tst_qndefrecord
SOURCES
tst_qndefrecord.cpp
PUBLIC_LIBRARIES

View File

@ -12,7 +12,7 @@ endif()
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_add_test(tst_qnearfieldmanager
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
@ -33,7 +33,7 @@ qt_add_test(tst_qnearfieldmanager
## Scopes:
#####################################################################
qt_extend_target(tst_qnearfieldmanager CONDITION builtin_testdata
qt_internal_extend_target(tst_qnearfieldmanager CONDITION builtin_testdata
DEFINES
BUILTIN_TESTDATA
)

View File

@ -14,7 +14,7 @@ endif()
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
qt_add_test(tst_qnearfieldmanager
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
@ -35,7 +35,7 @@ qt_add_test(tst_qnearfieldmanager
## Scopes:
#####################################################################
qt_extend_target(tst_qnearfieldmanager CONDITION builtin_testdata
qt_internal_extend_target(tst_qnearfieldmanager CONDITION builtin_testdata
DEFINES
BUILTIN_TESTDATA
)

View File

@ -12,7 +12,7 @@ endif()
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_add_test(tst_qnearfieldtagtype1
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
@ -33,7 +33,7 @@ qt_add_test(tst_qnearfieldtagtype1
## Scopes:
#####################################################################
qt_extend_target(tst_qnearfieldtagtype1 CONDITION builtin_testdata
qt_internal_extend_target(tst_qnearfieldtagtype1 CONDITION builtin_testdata
DEFINES
BUILTIN_TESTDATA
)

View File

@ -14,7 +14,7 @@ endif()
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
qt_add_test(tst_qnearfieldtagtype1
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
@ -35,7 +35,7 @@ qt_add_test(tst_qnearfieldtagtype1
## Scopes:
#####################################################################
qt_extend_target(tst_qnearfieldtagtype1 CONDITION builtin_testdata
qt_internal_extend_target(tst_qnearfieldtagtype1 CONDITION builtin_testdata
DEFINES
BUILTIN_TESTDATA
)

View File

@ -12,7 +12,7 @@ endif()
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_add_test(tst_qnearfieldtagtype2
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
@ -33,7 +33,7 @@ qt_add_test(tst_qnearfieldtagtype2
## Scopes:
#####################################################################
qt_extend_target(tst_qnearfieldtagtype2 CONDITION builtin_testdata
qt_internal_extend_target(tst_qnearfieldtagtype2 CONDITION builtin_testdata
DEFINES
BUILTIN_TESTDATA
)

View File

@ -14,7 +14,7 @@ endif()
list(APPEND test_data "nfcdata/Dynamic Empty Tag.nfc") # special case
list(APPEND test_data "nfcdata/Empty Tag.nfc") # special case
qt_add_test(tst_qnearfieldtagtype2
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
@ -35,7 +35,7 @@ qt_add_test(tst_qnearfieldtagtype2
## Scopes:
#####################################################################
qt_extend_target(tst_qnearfieldtagtype2 CONDITION builtin_testdata
qt_internal_extend_target(tst_qnearfieldtagtype2 CONDITION builtin_testdata
DEFINES
BUILTIN_TESTDATA
)

View File

@ -0,0 +1,42 @@
# Generated from bttestui.pro.
#####################################################################
## bttestui Binary:
#####################################################################
qt_internal_add_executable(bttestui
GUI
SOURCES
btlocaldevice.cpp btlocaldevice.h
main.cpp
PUBLIC_LIBRARIES
Qt::Bluetooth
Qt::Gui
Qt::Quick
)
# Resources:
set(bttest_resource_files
"Button.qml"
"main.qml"
)
qt_internal_add_resource(bttestui "bttest"
PREFIX
"/"
FILES
${bttest_resource_files}
)
#### Keys ignored in scope 1:.:.:bttestui.pro:<TRUE>:
# OTHER_FILES = "main.qml" "Button.qml"
# TEMPLATE = "app"
## Scopes:
#####################################################################
qt_internal_extend_target(bttestui CONDITION ANDROID
PUBLIC_LIBRARIES
Qt::AndroidExtras
)