summaryrefslogtreecommitdiffstats
path: root/tests/auto/network/access
diff options
context:
space:
mode:
authorAlexandru Croitor <alexandru.croitor@qt.io>2020-09-22 10:16:58 +0200
committerAlexandru Croitor <alexandru.croitor@qt.io>2020-09-23 16:59:06 +0200
commit403213240c7b2dc09378e1cb8c147131e368f90c (patch)
treeff86910332629fe5e2fab59a30fb863a5febb366 /tests/auto/network/access
parente0c62a48b8a826a46a143e57e94b2a0ea73c7cae (diff)
CMake: Regenerate projects to use new qt_internal_ API
Modify special case locations to use the new API as well. Clean up some stale .prev files that are not needed anymore. Clean up some project files that are not used anymore. Task-number: QTBUG-86815 Change-Id: I9947da921f98686023c6bb053dfcc101851276b5 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Diffstat (limited to 'tests/auto/network/access')
-rw-r--r--tests/auto/network/access/hpack/CMakeLists.txt2
-rw-r--r--tests/auto/network/access/hsts/CMakeLists.txt2
-rw-r--r--tests/auto/network/access/http2/CMakeLists.txt2
-rw-r--r--tests/auto/network/access/qabstractnetworkcache/.prev_CMakeLists.txt2
-rw-r--r--tests/auto/network/access/qabstractnetworkcache/CMakeLists.txt2
-rw-r--r--tests/auto/network/access/qdecompresshelper/.prev_CMakeLists.txt2
-rw-r--r--tests/auto/network/access/qdecompresshelper/CMakeLists.txt2
-rw-r--r--tests/auto/network/access/qhttpnetworkconnection/.prev_CMakeLists.txt2
-rw-r--r--tests/auto/network/access/qhttpnetworkconnection/CMakeLists.txt2
-rw-r--r--tests/auto/network/access/qhttpnetworkreply/CMakeLists.txt2
-rw-r--r--tests/auto/network/access/qnetworkaccessmanager/CMakeLists.txt2
-rw-r--r--tests/auto/network/access/qnetworkcachemetadata/CMakeLists.txt2
-rw-r--r--tests/auto/network/access/qnetworkcookie/CMakeLists.txt2
-rw-r--r--tests/auto/network/access/qnetworkcookiejar/CMakeLists.txt2
-rw-r--r--tests/auto/network/access/qnetworkdiskcache/CMakeLists.txt2
-rw-r--r--tests/auto/network/access/qnetworkreply/echo/.prev_CMakeLists.txt2
-rw-r--r--tests/auto/network/access/qnetworkreply/echo/CMakeLists.txt2
-rw-r--r--tests/auto/network/access/qnetworkreply/test/.prev_CMakeLists.txt4
-rw-r--r--tests/auto/network/access/qnetworkreply/test/CMakeLists.txt4
-rw-r--r--tests/auto/network/access/qnetworkrequest/CMakeLists.txt2
20 files changed, 22 insertions, 22 deletions
diff --git a/tests/auto/network/access/hpack/CMakeLists.txt b/tests/auto/network/access/hpack/CMakeLists.txt
index 08ff2a6798..421a60c17d 100644
--- a/tests/auto/network/access/hpack/CMakeLists.txt
+++ b/tests/auto/network/access/hpack/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_hpack Test:
#####################################################################
-qt_add_test(tst_hpack
+qt_internal_add_test(tst_hpack
SOURCES
tst_hpack.cpp
PUBLIC_LIBRARIES
diff --git a/tests/auto/network/access/hsts/CMakeLists.txt b/tests/auto/network/access/hsts/CMakeLists.txt
index 323fb84bc7..ba3b110f59 100644
--- a/tests/auto/network/access/hsts/CMakeLists.txt
+++ b/tests/auto/network/access/hsts/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qhsts Test:
#####################################################################
-qt_add_test(tst_qhsts
+qt_internal_add_test(tst_qhsts
SOURCES
tst_qhsts.cpp
PUBLIC_LIBRARIES
diff --git a/tests/auto/network/access/http2/CMakeLists.txt b/tests/auto/network/access/http2/CMakeLists.txt
index ed5f7c8275..7ac1c8001c 100644
--- a/tests/auto/network/access/http2/CMakeLists.txt
+++ b/tests/auto/network/access/http2/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_http2 Test:
#####################################################################
-qt_add_test(tst_http2
+qt_internal_add_test(tst_http2
SOURCES
../../../../shared/emulationdetector.h
http2srv.cpp http2srv.h
diff --git a/tests/auto/network/access/qabstractnetworkcache/.prev_CMakeLists.txt b/tests/auto/network/access/qabstractnetworkcache/.prev_CMakeLists.txt
index 3196ccca59..bf163c3883 100644
--- a/tests/auto/network/access/qabstractnetworkcache/.prev_CMakeLists.txt
+++ b/tests/auto/network/access/qabstractnetworkcache/.prev_CMakeLists.txt
@@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob
tests/*)
list(APPEND test_data ${test_data_glob})
-qt_add_test(tst_qabstractnetworkcache
+qt_internal_add_test(tst_qabstractnetworkcache
SOURCES
tst_qabstractnetworkcache.cpp
PUBLIC_LIBRARIES
diff --git a/tests/auto/network/access/qabstractnetworkcache/CMakeLists.txt b/tests/auto/network/access/qabstractnetworkcache/CMakeLists.txt
index 9ebd765fd4..3958916232 100644
--- a/tests/auto/network/access/qabstractnetworkcache/CMakeLists.txt
+++ b/tests/auto/network/access/qabstractnetworkcache/CMakeLists.txt
@@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob
tests/*)
list(APPEND test_data ${test_data_glob})
-qt_add_test(tst_qabstractnetworkcache
+qt_internal_add_test(tst_qabstractnetworkcache
SOURCES
tst_qabstractnetworkcache.cpp
PUBLIC_LIBRARIES
diff --git a/tests/auto/network/access/qdecompresshelper/.prev_CMakeLists.txt b/tests/auto/network/access/qdecompresshelper/.prev_CMakeLists.txt
index ce8f55646c..8f01ee712d 100644
--- a/tests/auto/network/access/qdecompresshelper/.prev_CMakeLists.txt
+++ b/tests/auto/network/access/qdecompresshelper/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qdecompresshelper Test:
#####################################################################
-qt_add_test(tst_qdecompresshelper
+qt_internal_add_test(tst_qdecompresshelper
SOURCES
gzip.rcc.cpp
inflate.rcc.cpp
diff --git a/tests/auto/network/access/qdecompresshelper/CMakeLists.txt b/tests/auto/network/access/qdecompresshelper/CMakeLists.txt
index 3b2f1b5e6f..49fd91db0a 100644
--- a/tests/auto/network/access/qdecompresshelper/CMakeLists.txt
+++ b/tests/auto/network/access/qdecompresshelper/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qdecompresshelper Test:
#####################################################################
-qt_add_test(tst_qdecompresshelper
+qt_internal_add_test(tst_qdecompresshelper
SOURCES
gzip.rcc.cpp
inflate.rcc.cpp
diff --git a/tests/auto/network/access/qhttpnetworkconnection/.prev_CMakeLists.txt b/tests/auto/network/access/qhttpnetworkconnection/.prev_CMakeLists.txt
index 621e339c1a..4c23a4f66b 100644
--- a/tests/auto/network/access/qhttpnetworkconnection/.prev_CMakeLists.txt
+++ b/tests/auto/network/access/qhttpnetworkconnection/.prev_CMakeLists.txt
@@ -8,7 +8,7 @@ endif()
## tst_qhttpnetworkconnection Test:
#####################################################################
-qt_add_test(tst_qhttpnetworkconnection
+qt_internal_add_test(tst_qhttpnetworkconnection
SOURCES
tst_qhttpnetworkconnection.cpp
PUBLIC_LIBRARIES
diff --git a/tests/auto/network/access/qhttpnetworkconnection/CMakeLists.txt b/tests/auto/network/access/qhttpnetworkconnection/CMakeLists.txt
index ffd9ea934e..29b345b0db 100644
--- a/tests/auto/network/access/qhttpnetworkconnection/CMakeLists.txt
+++ b/tests/auto/network/access/qhttpnetworkconnection/CMakeLists.txt
@@ -8,7 +8,7 @@ endif()
## tst_qhttpnetworkconnection Test:
#####################################################################
-qt_add_test(tst_qhttpnetworkconnection
+qt_internal_add_test(tst_qhttpnetworkconnection
SOURCES
tst_qhttpnetworkconnection.cpp
PUBLIC_LIBRARIES
diff --git a/tests/auto/network/access/qhttpnetworkreply/CMakeLists.txt b/tests/auto/network/access/qhttpnetworkreply/CMakeLists.txt
index f9ba96cf13..4d35cc8a2b 100644
--- a/tests/auto/network/access/qhttpnetworkreply/CMakeLists.txt
+++ b/tests/auto/network/access/qhttpnetworkreply/CMakeLists.txt
@@ -8,7 +8,7 @@ endif()
## tst_qhttpnetworkreply Test:
#####################################################################
-qt_add_test(tst_qhttpnetworkreply
+qt_internal_add_test(tst_qhttpnetworkreply
SOURCES
tst_qhttpnetworkreply.cpp
PUBLIC_LIBRARIES
diff --git a/tests/auto/network/access/qnetworkaccessmanager/CMakeLists.txt b/tests/auto/network/access/qnetworkaccessmanager/CMakeLists.txt
index 8fc928e8cf..1d819c3784 100644
--- a/tests/auto/network/access/qnetworkaccessmanager/CMakeLists.txt
+++ b/tests/auto/network/access/qnetworkaccessmanager/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qnetworkaccessmanager Test:
#####################################################################
-qt_add_test(tst_qnetworkaccessmanager
+qt_internal_add_test(tst_qnetworkaccessmanager
SOURCES
tst_qnetworkaccessmanager.cpp
PUBLIC_LIBRARIES
diff --git a/tests/auto/network/access/qnetworkcachemetadata/CMakeLists.txt b/tests/auto/network/access/qnetworkcachemetadata/CMakeLists.txt
index bcd47c7bcf..3a8bef0aa2 100644
--- a/tests/auto/network/access/qnetworkcachemetadata/CMakeLists.txt
+++ b/tests/auto/network/access/qnetworkcachemetadata/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qnetworkcachemetadata Test:
#####################################################################
-qt_add_test(tst_qnetworkcachemetadata
+qt_internal_add_test(tst_qnetworkcachemetadata
SOURCES
tst_qnetworkcachemetadata.cpp
PUBLIC_LIBRARIES
diff --git a/tests/auto/network/access/qnetworkcookie/CMakeLists.txt b/tests/auto/network/access/qnetworkcookie/CMakeLists.txt
index 24446c90ef..0460ff3235 100644
--- a/tests/auto/network/access/qnetworkcookie/CMakeLists.txt
+++ b/tests/auto/network/access/qnetworkcookie/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qnetworkcookie Test:
#####################################################################
-qt_add_test(tst_qnetworkcookie
+qt_internal_add_test(tst_qnetworkcookie
SOURCES
tst_qnetworkcookie.cpp
PUBLIC_LIBRARIES
diff --git a/tests/auto/network/access/qnetworkcookiejar/CMakeLists.txt b/tests/auto/network/access/qnetworkcookiejar/CMakeLists.txt
index f6aafcb69b..55f30633ee 100644
--- a/tests/auto/network/access/qnetworkcookiejar/CMakeLists.txt
+++ b/tests/auto/network/access/qnetworkcookiejar/CMakeLists.txt
@@ -7,7 +7,7 @@
# Collect test data
list(APPEND test_data "parser.json")
-qt_add_test(tst_qnetworkcookiejar
+qt_internal_add_test(tst_qnetworkcookiejar
SOURCES
tst_qnetworkcookiejar.cpp
PUBLIC_LIBRARIES
diff --git a/tests/auto/network/access/qnetworkdiskcache/CMakeLists.txt b/tests/auto/network/access/qnetworkdiskcache/CMakeLists.txt
index 484cb47e2b..af58132fb3 100644
--- a/tests/auto/network/access/qnetworkdiskcache/CMakeLists.txt
+++ b/tests/auto/network/access/qnetworkdiskcache/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qnetworkdiskcache Test:
#####################################################################
-qt_add_test(tst_qnetworkdiskcache
+qt_internal_add_test(tst_qnetworkdiskcache
SOURCES
tst_qnetworkdiskcache.cpp
PUBLIC_LIBRARIES
diff --git a/tests/auto/network/access/qnetworkreply/echo/.prev_CMakeLists.txt b/tests/auto/network/access/qnetworkreply/echo/.prev_CMakeLists.txt
index 17b6b275c9..60fe797d50 100644
--- a/tests/auto/network/access/qnetworkreply/echo/.prev_CMakeLists.txt
+++ b/tests/auto/network/access/qnetworkreply/echo/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
## echo Binary:
#####################################################################
-qt_add_executable(echo
+qt_internal_add_executable(echo
SOURCES
main.cpp
)
diff --git a/tests/auto/network/access/qnetworkreply/echo/CMakeLists.txt b/tests/auto/network/access/qnetworkreply/echo/CMakeLists.txt
index e06066ea4f..664b2f2fab 100644
--- a/tests/auto/network/access/qnetworkreply/echo/CMakeLists.txt
+++ b/tests/auto/network/access/qnetworkreply/echo/CMakeLists.txt
@@ -4,7 +4,7 @@
## echo Binary:
#####################################################################
-qt_add_executable(echo
+qt_internal_add_executable(echo
OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case
SOURCES
main.cpp
diff --git a/tests/auto/network/access/qnetworkreply/test/.prev_CMakeLists.txt b/tests/auto/network/access/qnetworkreply/test/.prev_CMakeLists.txt
index 19b430b159..337a505a54 100644
--- a/tests/auto/network/access/qnetworkreply/test/.prev_CMakeLists.txt
+++ b/tests/auto/network/access/qnetworkreply/test/.prev_CMakeLists.txt
@@ -17,7 +17,7 @@ list(APPEND test_data "../certs")
list(APPEND test_data "../index.html")
list(APPEND test_data "../smb-file.txt")
-qt_add_test(tst_qnetworkreply
+qt_internal_add_test(tst_qnetworkreply
SOURCES
../../../../../shared/emulationdetector.h
../tst_qnetworkreply.cpp
@@ -37,7 +37,7 @@ set(qnetworkreply_resource_files
"resource"
)
-qt_add_resource(tst_qnetworkreply "qnetworkreply"
+qt_internal_add_resource(tst_qnetworkreply "qnetworkreply"
PREFIX
"/"
BASE
diff --git a/tests/auto/network/access/qnetworkreply/test/CMakeLists.txt b/tests/auto/network/access/qnetworkreply/test/CMakeLists.txt
index 24f264703f..e60d254651 100644
--- a/tests/auto/network/access/qnetworkreply/test/CMakeLists.txt
+++ b/tests/auto/network/access/qnetworkreply/test/CMakeLists.txt
@@ -17,7 +17,7 @@ list(APPEND test_data "../certs")
list(APPEND test_data "../index.html")
list(APPEND test_data "../smb-file.txt")
-qt_add_test(tst_qnetworkreply
+qt_internal_add_test(tst_qnetworkreply
OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../" # special case
SOURCES
../../../../../shared/emulationdetector.h
@@ -39,7 +39,7 @@ set(qnetworkreply_resource_files
"resource"
)
-qt_add_resource(tst_qnetworkreply "qnetworkreply"
+qt_internal_add_resource(tst_qnetworkreply "qnetworkreply"
PREFIX
"/"
BASE
diff --git a/tests/auto/network/access/qnetworkrequest/CMakeLists.txt b/tests/auto/network/access/qnetworkrequest/CMakeLists.txt
index 2334165c3a..1a98449549 100644
--- a/tests/auto/network/access/qnetworkrequest/CMakeLists.txt
+++ b/tests/auto/network/access/qnetworkrequest/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qnetworkrequest Test:
#####################################################################
-qt_add_test(tst_qnetworkrequest
+qt_internal_add_test(tst_qnetworkrequest
SOURCES
tst_qnetworkrequest.cpp
PUBLIC_LIBRARIES