From ca7557335b3f23d97be8817797335f72cfb5d2cb Mon Sep 17 00:00:00 2001 From: Joerg Bornemann Date: Tue, 25 May 2021 15:01:50 +0200 Subject: CMake: Disable usage of CMake API compatibility wrappers Setting the QT_NO_INTERNAL_COMPATIBILITY_FUNCTIONS variable in the project ensures we ported away from old API calls. Task-number: QTBUG-86815 Change-Id: I034cce0921b65bf635c1d16a408bbd7141efe4a0 Reviewed-by: Qt CI Bot Reviewed-by: Alexandru Croitor --- tests/auto/qcoapclient/CMakeLists.txt | 4 ++-- tests/auto/qcoapinternalreply/CMakeLists.txt | 2 +- tests/auto/qcoapinternalrequest/CMakeLists.txt | 2 +- tests/auto/qcoapmessage/CMakeLists.txt | 2 +- tests/auto/qcoapoption/CMakeLists.txt | 2 +- tests/auto/qcoapqudpconnection/CMakeLists.txt | 4 ++-- tests/auto/qcoapreply/CMakeLists.txt | 2 +- tests/auto/qcoaprequest/CMakeLists.txt | 2 +- tests/auto/qcoapresource/CMakeLists.txt | 2 +- 9 files changed, 11 insertions(+), 11 deletions(-) (limited to 'tests') diff --git a/tests/auto/qcoapclient/CMakeLists.txt b/tests/auto/qcoapclient/CMakeLists.txt index 9fdf39c..15a8519 100644 --- a/tests/auto/qcoapclient/CMakeLists.txt +++ b/tests/auto/qcoapclient/CMakeLists.txt @@ -6,7 +6,7 @@ set (QT_TESTSERVER_COMPOSE_FILE "${CMAKE_CURRENT_SOURCE_DIR}/../../testserver/docker-compose.yml") -qt_add_test(qcoapclient +qt_internal_add_test(qcoapclient EXCEPTIONS # special case GUI SOURCES @@ -26,7 +26,7 @@ qt_add_test(qcoapclient ##################################################################### # special case begin -qt_extend_target(qcoapclient CONDITION DEFINED ENV{COAP_TEST_SERVER_IP} +qt_internal_extend_target(qcoapclient CONDITION DEFINED ENV{COAP_TEST_SERVER_IP} DEFINES COAP_TEST_SERVER_IP=\\\"$ENV{COAP_TEST_SERVER_IP}\\\" ) diff --git a/tests/auto/qcoapinternalreply/CMakeLists.txt b/tests/auto/qcoapinternalreply/CMakeLists.txt index e3fecfa..31aaf30 100644 --- a/tests/auto/qcoapinternalreply/CMakeLists.txt +++ b/tests/auto/qcoapinternalreply/CMakeLists.txt @@ -4,7 +4,7 @@ ## qcoapinternalreply Test: ##################################################################### -qt_add_test(qcoapinternalreply +qt_internal_add_test(qcoapinternalreply SOURCES tst_qcoapinternalreply.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/qcoapinternalrequest/CMakeLists.txt b/tests/auto/qcoapinternalrequest/CMakeLists.txt index 5500061..6da9348 100644 --- a/tests/auto/qcoapinternalrequest/CMakeLists.txt +++ b/tests/auto/qcoapinternalrequest/CMakeLists.txt @@ -4,7 +4,7 @@ ## qcoapinternalrequest Test: ##################################################################### -qt_add_test(qcoapinternalrequest +qt_internal_add_test(qcoapinternalrequest SOURCES tst_qcoapinternalrequest.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/qcoapmessage/CMakeLists.txt b/tests/auto/qcoapmessage/CMakeLists.txt index 7cb5cc2..036aa5f 100644 --- a/tests/auto/qcoapmessage/CMakeLists.txt +++ b/tests/auto/qcoapmessage/CMakeLists.txt @@ -4,7 +4,7 @@ ## qcoapmessage Test: ##################################################################### -qt_add_test(qcoapmessage +qt_internal_add_test(qcoapmessage SOURCES tst_qcoapmessage.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/qcoapoption/CMakeLists.txt b/tests/auto/qcoapoption/CMakeLists.txt index 99c1165..2783bbe 100644 --- a/tests/auto/qcoapoption/CMakeLists.txt +++ b/tests/auto/qcoapoption/CMakeLists.txt @@ -4,7 +4,7 @@ ## qcoapoption Test: ##################################################################### -qt_add_test(qcoapoption +qt_internal_add_test(qcoapoption SOURCES tst_qcoapoption.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/qcoapqudpconnection/CMakeLists.txt b/tests/auto/qcoapqudpconnection/CMakeLists.txt index 8a351fd..d2d2bd3 100644 --- a/tests/auto/qcoapqudpconnection/CMakeLists.txt +++ b/tests/auto/qcoapqudpconnection/CMakeLists.txt @@ -6,7 +6,7 @@ set (QT_TESTSERVER_COMPOSE_FILE "${CMAKE_CURRENT_SOURCE_DIR}/../../testserver/docker-compose.yml") -qt_add_test(qcoapqudpconnection +qt_internal_add_test(qcoapqudpconnection SOURCES ../coapnetworksettings.h tst_qcoapqudpconnection.cpp @@ -24,7 +24,7 @@ qt_add_test(qcoapqudpconnection ##################################################################### # special case begin -qt_extend_target(qcoapqudpconnection CONDITION DEFINED ENV{COAP_TEST_SERVER_IP} +qt_internal_extend_target(qcoapqudpconnection CONDITION DEFINED ENV{COAP_TEST_SERVER_IP} DEFINES COAP_TEST_SERVER_IP=\\\"$ENV{COAP_TEST_SERVER_IP}\\\" ) diff --git a/tests/auto/qcoapreply/CMakeLists.txt b/tests/auto/qcoapreply/CMakeLists.txt index 75581b6..eebfab7 100644 --- a/tests/auto/qcoapreply/CMakeLists.txt +++ b/tests/auto/qcoapreply/CMakeLists.txt @@ -4,7 +4,7 @@ ## qcoapreply Test: ##################################################################### -qt_add_test(qcoapreply +qt_internal_add_test(qcoapreply SOURCES tst_qcoapreply.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/qcoaprequest/CMakeLists.txt b/tests/auto/qcoaprequest/CMakeLists.txt index 0c6d925..3011cef 100644 --- a/tests/auto/qcoaprequest/CMakeLists.txt +++ b/tests/auto/qcoaprequest/CMakeLists.txt @@ -4,7 +4,7 @@ ## qcoaprequest Test: ##################################################################### -qt_add_test(qcoaprequest +qt_internal_add_test(qcoaprequest SOURCES tst_qcoaprequest.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/qcoapresource/CMakeLists.txt b/tests/auto/qcoapresource/CMakeLists.txt index 07e6f71..07743fc 100644 --- a/tests/auto/qcoapresource/CMakeLists.txt +++ b/tests/auto/qcoapresource/CMakeLists.txt @@ -4,7 +4,7 @@ ## qcoapresource Test: ##################################################################### -qt_add_test(qcoapresource +qt_internal_add_test(qcoapresource SOURCES tst_qcoapresource.cpp PUBLIC_LIBRARIES -- cgit v1.2.3