summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorAlexandru Croitor <alexandru.croitor@qt.io>2019-10-11 16:55:55 +0200
committerAlexandru Croitor <alexandru.croitor@qt.io>2019-10-14 19:01:19 +0000
commit190e9dcdcf1a2debfbf624af4cb2154172908a64 (patch)
tree3feb15de63b05cda8339d784c46f929ad4000357 /tests
parent440286655e0ca271506cf7cc02ad0dbf4baef9ca (diff)
Regenerate files after dev -> wip/cmake merge
Note the following bigger things that had to be done: Handle GSS library / feature with a new custom find module. Implement rudimentary support for relocatability (does not currently handle extprefix). Change-Id: Ic6cd27dda7ebca9829f51cb42ea76fff6d1767ef Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'tests')
-rw-r--r--tests/auto/network/access/CMakeLists.txt1
-rw-r--r--tests/auto/network/access/spdy/CMakeLists.txt25
-rw-r--r--tests/auto/network/socket/qudpsocket/test/CMakeLists.txt3
3 files changed, 0 insertions, 29 deletions
diff --git a/tests/auto/network/access/CMakeLists.txt b/tests/auto/network/access/CMakeLists.txt
index 9f8513dccb..6d4b2b7263 100644
--- a/tests/auto/network/access/CMakeLists.txt
+++ b/tests/auto/network/access/CMakeLists.txt
@@ -6,7 +6,6 @@ add_subdirectory(qnetworkaccessmanager)
add_subdirectory(qnetworkcookie)
add_subdirectory(qnetworkrequest)
add_subdirectory(qnetworkreply)
-add_subdirectory(spdy)
add_subdirectory(qnetworkcachemetadata)
add_subdirectory(qabstractnetworkcache)
diff --git a/tests/auto/network/access/spdy/CMakeLists.txt b/tests/auto/network/access/spdy/CMakeLists.txt
deleted file mode 100644
index ac70833b56..0000000000
--- a/tests/auto/network/access/spdy/CMakeLists.txt
+++ /dev/null
@@ -1,25 +0,0 @@
-# Generated from spdy.pro.
-
-#####################################################################
-## tst_spdy Test:
-#####################################################################
-
-add_qt_test(tst_spdy
- GUI
- SOURCES
- tst_spdy.cpp
- LIBRARIES
- Qt::CorePrivate
- Qt::NetworkPrivate
- PUBLIC_LIBRARIES
- Qt::Network
-)
-
-#### Keys ignored in scope 1:.:.:spdy.pro:<TRUE>:
-# CONFIG = "testcase"
-
-## Scopes:
-#####################################################################
-
-#### Keys ignored in scope 2:.:.:spdy.pro:WIN32:
-# CONFIG = "insignificant_test"
diff --git a/tests/auto/network/socket/qudpsocket/test/CMakeLists.txt b/tests/auto/network/socket/qudpsocket/test/CMakeLists.txt
index 952a4a6833..f5ec5f50ce 100644
--- a/tests/auto/network/socket/qudpsocket/test/CMakeLists.txt
+++ b/tests/auto/network/socket/qudpsocket/test/CMakeLists.txt
@@ -5,7 +5,6 @@
#####################################################################
add_qt_test(tst_qudpsocket
- GUI
SOURCES
../tst_qudpsocket.cpp
INCLUDE_DIRECTORIES
@@ -15,7 +14,6 @@ add_qt_test(tst_qudpsocket
)
#### Keys ignored in scope 1:.:.:test.pro:<TRUE>:
-# CONFIG = "testcase"
# MOC_DIR = "tmp"
# testcase.timeout = "800"
@@ -32,5 +30,4 @@ add_qt_test(tst_qudpsocket
# DESTDIR = "../"
#### Keys ignored in scope 6:.:.:test.pro:LINUX:
-# CONFIG = "unsupported/testserver"
# QT_TEST_SERVER_LIST = "danted" "echo"