From ad2da2d27a590333fc89a56fc58700a09c3017b3 Mon Sep 17 00:00:00 2001 From: Joerg Bornemann Date: Thu, 17 Dec 2020 14:55:57 +0100 Subject: Remove the qmake project files Remove the qmake project files for most of Qt. Leave the qmake project files for examples, because we still test those in the CI to ensure qmake does not regress. Also leave the qmake project files for utils and other minor parts that lack CMake project files. Task-number: QTBUG-88742 Change-Id: I6cdf059e6204816f617f9624f3ea9822703f73cc Reviewed-by: Edward Welbourne Reviewed-by: Qt CI Bot Reviewed-by: Kai Koehne --- .../auto/network/ssl/qasn1element/qasn1element.pro | 6 ---- tests/auto/network/ssl/qdtls/qdtls.pro | 16 ---------- tests/auto/network/ssl/qdtlscookie/qdtlscookie.pro | 15 ---------- tests/auto/network/ssl/qocsp/qocsp.pro | 15 ---------- .../ssl/qpassworddigestor/qpassworddigestor.pro | 4 --- .../ssl/qsslcertificate/qsslcertificate.pro | 8 ----- tests/auto/network/ssl/qsslcipher/qsslcipher.pro | 14 --------- .../qssldiffiehellmanparameters.pro | 7 ----- .../ssl/qsslellipticcurve/qsslellipticcurve.pro | 6 ---- tests/auto/network/ssl/qsslerror/qsslerror.pro | 14 --------- tests/auto/network/ssl/qsslkey/qsslkey.pro | 12 -------- tests/auto/network/ssl/qsslsocket/qsslsocket.pro | 27 ----------------- .../qsslsocket_onDemandCertificates_member.pro | 25 ---------------- .../qsslsocket_onDemandCertificates_static.pro | 24 --------------- tests/auto/network/ssl/ssl.pro | 34 ---------------------- 15 files changed, 227 deletions(-) delete mode 100644 tests/auto/network/ssl/qasn1element/qasn1element.pro delete mode 100644 tests/auto/network/ssl/qdtls/qdtls.pro delete mode 100644 tests/auto/network/ssl/qdtlscookie/qdtlscookie.pro delete mode 100644 tests/auto/network/ssl/qocsp/qocsp.pro delete mode 100644 tests/auto/network/ssl/qpassworddigestor/qpassworddigestor.pro delete mode 100644 tests/auto/network/ssl/qsslcertificate/qsslcertificate.pro delete mode 100644 tests/auto/network/ssl/qsslcipher/qsslcipher.pro delete mode 100644 tests/auto/network/ssl/qssldiffiehellmanparameters/qssldiffiehellmanparameters.pro delete mode 100644 tests/auto/network/ssl/qsslellipticcurve/qsslellipticcurve.pro delete mode 100644 tests/auto/network/ssl/qsslerror/qsslerror.pro delete mode 100644 tests/auto/network/ssl/qsslkey/qsslkey.pro delete mode 100644 tests/auto/network/ssl/qsslsocket/qsslsocket.pro delete mode 100644 tests/auto/network/ssl/qsslsocket_onDemandCertificates_member/qsslsocket_onDemandCertificates_member.pro delete mode 100644 tests/auto/network/ssl/qsslsocket_onDemandCertificates_static/qsslsocket_onDemandCertificates_static.pro delete mode 100644 tests/auto/network/ssl/ssl.pro (limited to 'tests/auto/network/ssl') diff --git a/tests/auto/network/ssl/qasn1element/qasn1element.pro b/tests/auto/network/ssl/qasn1element/qasn1element.pro deleted file mode 100644 index 006ac3428c..0000000000 --- a/tests/auto/network/ssl/qasn1element/qasn1element.pro +++ /dev/null @@ -1,6 +0,0 @@ -CONFIG += testcase - -SOURCES += tst_qasn1element.cpp -QT = core network network-private testlib - -TARGET = tst_qasn1element diff --git a/tests/auto/network/ssl/qdtls/qdtls.pro b/tests/auto/network/ssl/qdtls/qdtls.pro deleted file mode 100644 index 19e13a965c..0000000000 --- a/tests/auto/network/ssl/qdtls/qdtls.pro +++ /dev/null @@ -1,16 +0,0 @@ -CONFIG += testcase - -SOURCES += tst_qdtls.cpp -QT = core network-private testlib - -TARGET = tst_qdtls - -win32 { - CONFIG(debug, debug|release) { - DESTDIR = debug - } else { - DESTDIR = release - } -} - -TESTDATA += certs diff --git a/tests/auto/network/ssl/qdtlscookie/qdtlscookie.pro b/tests/auto/network/ssl/qdtlscookie/qdtlscookie.pro deleted file mode 100644 index 4caa89fe49..0000000000 --- a/tests/auto/network/ssl/qdtlscookie/qdtlscookie.pro +++ /dev/null @@ -1,15 +0,0 @@ -CONFIG += testcase - -SOURCES += tst_qdtlscookie.cpp -QT = core network-private testlib - -TARGET = tst_qdtlscookie - -win32 { - CONFIG(debug, debug|release) { - DESTDIR = debug - } else { - DESTDIR = release - } -} - diff --git a/tests/auto/network/ssl/qocsp/qocsp.pro b/tests/auto/network/ssl/qocsp/qocsp.pro deleted file mode 100644 index f4e846f39b..0000000000 --- a/tests/auto/network/ssl/qocsp/qocsp.pro +++ /dev/null @@ -1,15 +0,0 @@ -CONFIG += testcase - -SOURCES += tst_qocsp.cpp -QT = core network network-private testlib - -TARGET = tst_qocsp - -win32 { - CONFIG(debug, debug|release) { - DESTDIR = debug - } else { - DESTDIR = release - } -} - diff --git a/tests/auto/network/ssl/qpassworddigestor/qpassworddigestor.pro b/tests/auto/network/ssl/qpassworddigestor/qpassworddigestor.pro deleted file mode 100644 index 3e2685f579..0000000000 --- a/tests/auto/network/ssl/qpassworddigestor/qpassworddigestor.pro +++ /dev/null @@ -1,4 +0,0 @@ -CONFIG += testcase -TARGET = tst_qpassworddigestor -QT = core network testlib -SOURCES = tst_qpassworddigestor.cpp diff --git a/tests/auto/network/ssl/qsslcertificate/qsslcertificate.pro b/tests/auto/network/ssl/qsslcertificate/qsslcertificate.pro deleted file mode 100644 index 7e6870f74b..0000000000 --- a/tests/auto/network/ssl/qsslcertificate/qsslcertificate.pro +++ /dev/null @@ -1,8 +0,0 @@ -CONFIG += testcase - -SOURCES += tst_qsslcertificate.cpp -QT = core network testlib - -TARGET = tst_qsslcertificate - -TESTDATA += certificates/* more-certificates/* verify-certs/* pkcs12/* diff --git a/tests/auto/network/ssl/qsslcipher/qsslcipher.pro b/tests/auto/network/ssl/qsslcipher/qsslcipher.pro deleted file mode 100644 index 392d22c054..0000000000 --- a/tests/auto/network/ssl/qsslcipher/qsslcipher.pro +++ /dev/null @@ -1,14 +0,0 @@ -CONFIG += testcase - -SOURCES += tst_qsslcipher.cpp -QT = core network testlib - -TARGET = tst_qsslcipher - -win32 { - CONFIG(debug, debug|release) { - DESTDIR = debug -} else { - DESTDIR = release - } -} diff --git a/tests/auto/network/ssl/qssldiffiehellmanparameters/qssldiffiehellmanparameters.pro b/tests/auto/network/ssl/qssldiffiehellmanparameters/qssldiffiehellmanparameters.pro deleted file mode 100644 index 2d45f4476c..0000000000 --- a/tests/auto/network/ssl/qssldiffiehellmanparameters/qssldiffiehellmanparameters.pro +++ /dev/null @@ -1,7 +0,0 @@ -CONFIG += testcase -CONFIG += parallel_test - -SOURCES += tst_qssldiffiehellmanparameters.cpp -QT = core network testlib - -TARGET = tst_qssldiffiehellmanparameters diff --git a/tests/auto/network/ssl/qsslellipticcurve/qsslellipticcurve.pro b/tests/auto/network/ssl/qsslellipticcurve/qsslellipticcurve.pro deleted file mode 100644 index 7eae6ae864..0000000000 --- a/tests/auto/network/ssl/qsslellipticcurve/qsslellipticcurve.pro +++ /dev/null @@ -1,6 +0,0 @@ -CONFIG += testcase - -SOURCES += tst_qsslellipticcurve.cpp -QT = core network testlib - -TARGET = tst_qsslellipticcurve diff --git a/tests/auto/network/ssl/qsslerror/qsslerror.pro b/tests/auto/network/ssl/qsslerror/qsslerror.pro deleted file mode 100644 index 83644d093c..0000000000 --- a/tests/auto/network/ssl/qsslerror/qsslerror.pro +++ /dev/null @@ -1,14 +0,0 @@ -CONFIG += testcase - -SOURCES += tst_qsslerror.cpp -QT = core network testlib - -TARGET = tst_qsslerror - -win32 { - CONFIG(debug, debug|release) { - DESTDIR = debug -} else { - DESTDIR = release - } -} diff --git a/tests/auto/network/ssl/qsslkey/qsslkey.pro b/tests/auto/network/ssl/qsslkey/qsslkey.pro deleted file mode 100644 index 8ed65e68ad..0000000000 --- a/tests/auto/network/ssl/qsslkey/qsslkey.pro +++ /dev/null @@ -1,12 +0,0 @@ -CONFIG += testcase - -SOURCES += tst_qsslkey.cpp -QT = core network testlib -qtConfig(private_tests) { - QT += core-private network-private -} - -TARGET = tst_qsslkey - -TESTDATA += keys/* \ - rsa-*.pem diff --git a/tests/auto/network/ssl/qsslsocket/qsslsocket.pro b/tests/auto/network/ssl/qsslsocket/qsslsocket.pro deleted file mode 100644 index 51fcff9a8d..0000000000 --- a/tests/auto/network/ssl/qsslsocket/qsslsocket.pro +++ /dev/null @@ -1,27 +0,0 @@ -CONFIG += testcase - -SOURCES += tst_qsslsocket.cpp -QT = core core-private network-private testlib - -TARGET = tst_qsslsocket - -win32 { - CONFIG(debug, debug|release) { - DESTDIR = debug -} else { - DESTDIR = release - } -} - -TESTDATA += certs - -DEFINES += SRCDIR=\\\"$$PWD/\\\" - -requires(qtConfig(private_tests)) - -# DOCKERTODO: it's 'linux' because it requires cyrus, which -# is linux-only for now ... -linux { - CONFIG += unsupported/testserver - QT_TEST_SERVER_LIST = squid danted cyrus apache2 echo -} diff --git a/tests/auto/network/ssl/qsslsocket_onDemandCertificates_member/qsslsocket_onDemandCertificates_member.pro b/tests/auto/network/ssl/qsslsocket_onDemandCertificates_member/qsslsocket_onDemandCertificates_member.pro deleted file mode 100644 index 8585a3c861..0000000000 --- a/tests/auto/network/ssl/qsslsocket_onDemandCertificates_member/qsslsocket_onDemandCertificates_member.pro +++ /dev/null @@ -1,25 +0,0 @@ -CONFIG += testcase -testcase.timeout = 300 # this test is slow - -SOURCES += tst_qsslsocket_onDemandCertificates_member.cpp -QT = core core-private network-private testlib - -TARGET = tst_qsslsocket_onDemandCertificates_member - -win32 { - CONFIG(debug, debug|release) { - DESTDIR = debug -} else { - DESTDIR = release - } -} - -DEFINES += SRCDIR=\\\"$$PWD/\\\" - -requires(qtConfig(private_tests)) - -# DOCKERTODO: linux, docker is disabled on macOS/Windows. -linux { - CONFIG += unsupported/testserver - QT_TEST_SERVER_LIST = squid danted -} diff --git a/tests/auto/network/ssl/qsslsocket_onDemandCertificates_static/qsslsocket_onDemandCertificates_static.pro b/tests/auto/network/ssl/qsslsocket_onDemandCertificates_static/qsslsocket_onDemandCertificates_static.pro deleted file mode 100644 index 158ecbee37..0000000000 --- a/tests/auto/network/ssl/qsslsocket_onDemandCertificates_static/qsslsocket_onDemandCertificates_static.pro +++ /dev/null @@ -1,24 +0,0 @@ -CONFIG += testcase - -SOURCES += tst_qsslsocket_onDemandCertificates_static.cpp -QT = core core-private network-private testlib - -TARGET = tst_qsslsocket_onDemandCertificates_static - -win32 { - CONFIG(debug, debug|release) { - DESTDIR = debug -} else { - DESTDIR = release - } -} - -DEFINES += SRCDIR=\\\"$$PWD/\\\" - -requires(qtConfig(private_tests)) - -#DOCKERTODO Linux, docker is disabled on macOS and Windows. -linux { - CONFIG += unsupported/testserver - QT_TEST_SERVER_LIST = squid danted -} diff --git a/tests/auto/network/ssl/ssl.pro b/tests/auto/network/ssl/ssl.pro deleted file mode 100644 index e5e7435b6d..0000000000 --- a/tests/auto/network/ssl/ssl.pro +++ /dev/null @@ -1,34 +0,0 @@ -TEMPLATE=subdirs -QT_FOR_CONFIG += network-private - -SUBDIRS=\ - qpassworddigestor \ - qsslcertificate \ - qsslcipher \ - qsslellipticcurve - -qtConfig(ssl) { - SUBDIRS += qsslkey \ - qsslerror - qtConfig(private_tests) { - SUBDIRS += \ - qsslsocket \ - qsslsocket_onDemandCertificates_member \ - qsslsocket_onDemandCertificates_static - - qtConfig(dtls) { - SUBDIRS += \ - qdtlscookie \ - qdtls - } - - qtConfig(ocsp): SUBDIRS += qocsp - } -} - -qtConfig(ssl) { - qtConfig(private_tests) { - SUBDIRS += qasn1element \ - qssldiffiehellmanparameters - } -} -- cgit v1.2.3