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 --- .../platformsocketengine/platformsocketengine.pri | 8 ------- .../platformsocketengine/platformsocketengine.pro | 11 --------- .../socket/qabstractsocket/qabstractsocket.pro | 10 -------- .../socket/qhttpsocketengine/qhttpsocketengine.pro | 17 ------------- .../network/socket/qlocalsocket/qlocalsocket.pro | 2 -- .../qlocalsocket/socketprocess/socketprocess.pro | 8 ------- .../auto/network/socket/qlocalsocket/test/test.pro | 21 ---------------- .../network/socket/qsctpsocket/qsctpsocket.pro | 6 ----- .../qsocks5socketengine/qsocks5socketengine.pro | 19 --------------- .../qtcpserver/crashingServer/crashingServer.pro | 8 ------- .../auto/network/socket/qtcpserver/qtcpserver.pro | 4 ---- tests/auto/network/socket/qtcpserver/test/test.pro | 24 ------------------- .../auto/network/socket/qtcpsocket/qtcpsocket.pro | 8 ------- .../socket/qtcpsocket/stressTest/stressTest.pro | 8 ------- tests/auto/network/socket/qtcpsocket/test/test.pro | 23 ------------------ .../qudpsocket/clientserver/clientserver.pro | 5 ---- .../auto/network/socket/qudpsocket/qudpsocket.pro | 3 --- tests/auto/network/socket/qudpsocket/test/test.pro | 25 ------------------- .../socket/qudpsocket/udpServer/udpServer.pro | 3 --- tests/auto/network/socket/socket.pro | 28 ---------------------- 20 files changed, 241 deletions(-) delete mode 100644 tests/auto/network/socket/platformsocketengine/platformsocketengine.pri delete mode 100644 tests/auto/network/socket/platformsocketengine/platformsocketengine.pro delete mode 100644 tests/auto/network/socket/qabstractsocket/qabstractsocket.pro delete mode 100644 tests/auto/network/socket/qhttpsocketengine/qhttpsocketengine.pro delete mode 100644 tests/auto/network/socket/qlocalsocket/qlocalsocket.pro delete mode 100644 tests/auto/network/socket/qlocalsocket/socketprocess/socketprocess.pro delete mode 100644 tests/auto/network/socket/qlocalsocket/test/test.pro delete mode 100644 tests/auto/network/socket/qsctpsocket/qsctpsocket.pro delete mode 100644 tests/auto/network/socket/qsocks5socketengine/qsocks5socketengine.pro delete mode 100644 tests/auto/network/socket/qtcpserver/crashingServer/crashingServer.pro delete mode 100644 tests/auto/network/socket/qtcpserver/qtcpserver.pro delete mode 100644 tests/auto/network/socket/qtcpserver/test/test.pro delete mode 100644 tests/auto/network/socket/qtcpsocket/qtcpsocket.pro delete mode 100644 tests/auto/network/socket/qtcpsocket/stressTest/stressTest.pro delete mode 100644 tests/auto/network/socket/qtcpsocket/test/test.pro delete mode 100644 tests/auto/network/socket/qudpsocket/clientserver/clientserver.pro delete mode 100644 tests/auto/network/socket/qudpsocket/qudpsocket.pro delete mode 100644 tests/auto/network/socket/qudpsocket/test/test.pro delete mode 100644 tests/auto/network/socket/qudpsocket/udpServer/udpServer.pro delete mode 100644 tests/auto/network/socket/socket.pro (limited to 'tests/auto/network/socket') diff --git a/tests/auto/network/socket/platformsocketengine/platformsocketengine.pri b/tests/auto/network/socket/platformsocketengine/platformsocketengine.pri deleted file mode 100644 index 2247a43c3c..0000000000 --- a/tests/auto/network/socket/platformsocketengine/platformsocketengine.pri +++ /dev/null @@ -1,8 +0,0 @@ -QT += network - -QNETWORK_SRC = $$QT_SOURCE_TREE/src/network - -INCLUDEPATH += $$QNETWORK_SRC - -win32: LIBS += -lws2_32 - diff --git a/tests/auto/network/socket/platformsocketengine/platformsocketengine.pro b/tests/auto/network/socket/platformsocketengine/platformsocketengine.pro deleted file mode 100644 index ab96bb444e..0000000000 --- a/tests/auto/network/socket/platformsocketengine/platformsocketengine.pro +++ /dev/null @@ -1,11 +0,0 @@ -CONFIG += testcase -TARGET = tst_platformsocketengine -SOURCES += tst_platformsocketengine.cpp - -include(../platformsocketengine/platformsocketengine.pri) - -requires(qtConfig(private_tests)) - -MOC_DIR=tmp - -QT = core-private network-private testlib diff --git a/tests/auto/network/socket/qabstractsocket/qabstractsocket.pro b/tests/auto/network/socket/qabstractsocket/qabstractsocket.pro deleted file mode 100644 index 00e604972f..0000000000 --- a/tests/auto/network/socket/qabstractsocket/qabstractsocket.pro +++ /dev/null @@ -1,10 +0,0 @@ -############################################################ -# Project file for autotest for file qabstractsocket.h -############################################################ - -CONFIG += testcase -TARGET = tst_qabstractsocket -QT = core network testlib - -SOURCES += tst_qabstractsocket.cpp - diff --git a/tests/auto/network/socket/qhttpsocketengine/qhttpsocketengine.pro b/tests/auto/network/socket/qhttpsocketengine/qhttpsocketengine.pro deleted file mode 100644 index 63f41f4eb7..0000000000 --- a/tests/auto/network/socket/qhttpsocketengine/qhttpsocketengine.pro +++ /dev/null @@ -1,17 +0,0 @@ -CONFIG += testcase -TARGET = tst_qhttpsocketengine -SOURCES += tst_qhttpsocketengine.cpp - - -include(../platformsocketengine/platformsocketengine.pri) - -MOC_DIR=tmp - -requires(qtConfig(private_tests)) -QT = core-private network-private testlib - -# TODO: For now linux-only, because cyrus is linux-only atm ... -linux { - CONFIG += unsupported/testserver - QT_TEST_SERVER_LIST = squid danted cyrus apache2 -} diff --git a/tests/auto/network/socket/qlocalsocket/qlocalsocket.pro b/tests/auto/network/socket/qlocalsocket/qlocalsocket.pro deleted file mode 100644 index cbf5d160d9..0000000000 --- a/tests/auto/network/socket/qlocalsocket/qlocalsocket.pro +++ /dev/null @@ -1,2 +0,0 @@ -TEMPLATE = subdirs -SUBDIRS = test socketprocess diff --git a/tests/auto/network/socket/qlocalsocket/socketprocess/socketprocess.pro b/tests/auto/network/socket/qlocalsocket/socketprocess/socketprocess.pro deleted file mode 100644 index e11ed5644b..0000000000 --- a/tests/auto/network/socket/qlocalsocket/socketprocess/socketprocess.pro +++ /dev/null @@ -1,8 +0,0 @@ -QT = core network testlib - -DESTDIR = ./ -TARGET = socketprocess - -CONFIG += cmdline - -SOURCES += main.cpp diff --git a/tests/auto/network/socket/qlocalsocket/test/test.pro b/tests/auto/network/socket/qlocalsocket/test/test.pro deleted file mode 100644 index ab9ed90b1d..0000000000 --- a/tests/auto/network/socket/qlocalsocket/test/test.pro +++ /dev/null @@ -1,21 +0,0 @@ -CONFIG += testcase - -DEFINES += QLOCALSERVER_DEBUG -DEFINES += QLOCALSOCKET_DEBUG -DEFINES += SRCDIR=\\\"$$PWD/../\\\" - -QT = core network testlib - -SOURCES += ../tst_qlocalsocket.cpp - -TARGET = tst_qlocalsocket -CONFIG(debug_and_release) { - CONFIG(debug, debug|release) { - DESTDIR = ../debug - } else { - DESTDIR = ../release - } -} else { - DESTDIR = .. -} - diff --git a/tests/auto/network/socket/qsctpsocket/qsctpsocket.pro b/tests/auto/network/socket/qsctpsocket/qsctpsocket.pro deleted file mode 100644 index 49a40ce9b5..0000000000 --- a/tests/auto/network/socket/qsctpsocket/qsctpsocket.pro +++ /dev/null @@ -1,6 +0,0 @@ -CONFIG += testcase -TARGET = tst_qsctpsocket -QT = core network testlib - -SOURCES += tst_qsctpsocket.cpp - diff --git a/tests/auto/network/socket/qsocks5socketengine/qsocks5socketengine.pro b/tests/auto/network/socket/qsocks5socketengine/qsocks5socketengine.pro deleted file mode 100644 index 243eab9480..0000000000 --- a/tests/auto/network/socket/qsocks5socketengine/qsocks5socketengine.pro +++ /dev/null @@ -1,19 +0,0 @@ -CONFIG += testcase -TARGET = tst_qsocks5socketengine -SOURCES += tst_qsocks5socketengine.cpp - - -include(../platformsocketengine/platformsocketengine.pri) - - -MOC_DIR=tmp - -QT = core-private network-private testlib - -requires(qtConfig(private_tests)) - -# Only on Linux until cyrus has been added to docker-compose-for-{windows,macOS}.yml and tested -linux { - CONFIG += unsupported/testserver - QT_TEST_SERVER_LIST = danted apache2 cyrus -} diff --git a/tests/auto/network/socket/qtcpserver/crashingServer/crashingServer.pro b/tests/auto/network/socket/qtcpserver/crashingServer/crashingServer.pro deleted file mode 100644 index 487b9014d0..0000000000 --- a/tests/auto/network/socket/qtcpserver/crashingServer/crashingServer.pro +++ /dev/null @@ -1,8 +0,0 @@ -SOURCES += main.cpp -QT = core network -CONFIG -= app_bundle -DESTDIR = ./ - -# This means the auto test works on some machines for MinGW. No dialog stalls -# the application. -mingw:CONFIG += console diff --git a/tests/auto/network/socket/qtcpserver/qtcpserver.pro b/tests/auto/network/socket/qtcpserver/qtcpserver.pro deleted file mode 100644 index e123cfe73b..0000000000 --- a/tests/auto/network/socket/qtcpserver/qtcpserver.pro +++ /dev/null @@ -1,4 +0,0 @@ -TEMPLATE = subdirs -SUBDIRS = test crashingServer - - diff --git a/tests/auto/network/socket/qtcpserver/test/test.pro b/tests/auto/network/socket/qtcpserver/test/test.pro deleted file mode 100644 index 3e4ca8cbf6..0000000000 --- a/tests/auto/network/socket/qtcpserver/test/test.pro +++ /dev/null @@ -1,24 +0,0 @@ -CONFIG += testcase -SOURCES += ../tst_qtcpserver.cpp - -win32: LIBS += -lws2_32 - -TARGET = tst_qtcpserver - -win32 { - CONFIG(debug, debug|release) { - TARGET = ../debug/tst_qtcpserver -} else { - TARGET = ../release/tst_qtcpserver - } -} - -QT = core network testlib - -MOC_DIR=tmp - -# Only on Linux until cyrus has been added to docker-compose-for-{windows,macOS}.yml and tested -linux { - CONFIG += unsupported/testserver - QT_TEST_SERVER_LIST = danted cyrus squid ftp-proxy -} diff --git a/tests/auto/network/socket/qtcpsocket/qtcpsocket.pro b/tests/auto/network/socket/qtcpsocket/qtcpsocket.pro deleted file mode 100644 index 1f13a396dd..0000000000 --- a/tests/auto/network/socket/qtcpsocket/qtcpsocket.pro +++ /dev/null @@ -1,8 +0,0 @@ -TEMPLATE = subdirs - -SUBDIRS = test -!vxworks{ -SUBDIRS += stressTest -test.depends = stressTest -} -requires(qtConfig(private_tests)) diff --git a/tests/auto/network/socket/qtcpsocket/stressTest/stressTest.pro b/tests/auto/network/socket/qtcpsocket/stressTest/stressTest.pro deleted file mode 100644 index 6afc008e7d..0000000000 --- a/tests/auto/network/socket/qtcpsocket/stressTest/stressTest.pro +++ /dev/null @@ -1,8 +0,0 @@ -HEADERS += Test.h -SOURCES += main.cpp Test.cpp -QT = core network testlib - -CONFIG += cmdline -DESTDIR = ./ -MOC_DIR = .moc/ -TMP_DIR = .tmp/ diff --git a/tests/auto/network/socket/qtcpsocket/test/test.pro b/tests/auto/network/socket/qtcpsocket/test/test.pro deleted file mode 100644 index ceffe28fff..0000000000 --- a/tests/auto/network/socket/qtcpsocket/test/test.pro +++ /dev/null @@ -1,23 +0,0 @@ -CONFIG += testcase - -QT = core-private network-private testlib -SOURCES += ../tst_qtcpsocket.cpp - -win32: LIBS += -lws2_32 -TARGET = tst_qtcpsocket - -win32 { - CONFIG(debug, debug|release) { - DESTDIR = ../debug -} else { - DESTDIR = ../release - } -} else { - DESTDIR = ../ -} - -# Only on Linux until cyrus has been added to docker-compose-for-{windows,macOS}.yml and tested -linux { - CONFIG += unsupported/testserver - QT_TEST_SERVER_LIST = danted squid apache2 ftp-proxy vsftpd iptables cyrus -} diff --git a/tests/auto/network/socket/qudpsocket/clientserver/clientserver.pro b/tests/auto/network/socket/qudpsocket/clientserver/clientserver.pro deleted file mode 100644 index 83a31b11e9..0000000000 --- a/tests/auto/network/socket/qudpsocket/clientserver/clientserver.pro +++ /dev/null @@ -1,5 +0,0 @@ -QT = core network -SOURCES += main.cpp -CONFIG += cmdline -TARGET = clientserver -DESTDIR = ./ diff --git a/tests/auto/network/socket/qudpsocket/qudpsocket.pro b/tests/auto/network/socket/qudpsocket/qudpsocket.pro deleted file mode 100644 index b267d5f249..0000000000 --- a/tests/auto/network/socket/qudpsocket/qudpsocket.pro +++ /dev/null @@ -1,3 +0,0 @@ -TEMPLATE = subdirs -SUBDIRS = test clientserver -test.depends = clientserver diff --git a/tests/auto/network/socket/qudpsocket/test/test.pro b/tests/auto/network/socket/qudpsocket/test/test.pro deleted file mode 100644 index 994b360370..0000000000 --- a/tests/auto/network/socket/qudpsocket/test/test.pro +++ /dev/null @@ -1,25 +0,0 @@ -CONFIG += testcase -testcase.timeout = 800 # this test is slow -SOURCES += ../tst_qudpsocket.cpp -INCLUDEPATH += ../../../../../shared/ -QT = core network testlib - -MOC_DIR=tmp - -win32:debug_and_release { - CONFIG(debug, debug|release) { - DESTDIR = ../debug -} else { - DESTDIR = ../release - } -} else { - DESTDIR = ../ -} - -TARGET = tst_qudpsocket - -# Only on Linux until 'echo' has been added to docker-compose-for-{windows,macOS}.yml and tested -linux { - CONFIG += unsupported/testserver - QT_TEST_SERVER_LIST = danted echo -} diff --git a/tests/auto/network/socket/qudpsocket/udpServer/udpServer.pro b/tests/auto/network/socket/qudpsocket/udpServer/udpServer.pro deleted file mode 100644 index c8f9ebf648..0000000000 --- a/tests/auto/network/socket/qudpsocket/udpServer/udpServer.pro +++ /dev/null @@ -1,3 +0,0 @@ -SOURCES += main.cpp -QT = core network -CONFIG += cmdline diff --git a/tests/auto/network/socket/socket.pro b/tests/auto/network/socket/socket.pro deleted file mode 100644 index e71c6884cd..0000000000 --- a/tests/auto/network/socket/socket.pro +++ /dev/null @@ -1,28 +0,0 @@ -TEMPLATE=subdirs -QT_FOR_CONFIG += network - -SUBDIRS=\ - qhttpsocketengine \ - qudpsocket \ - qtcpsocket \ - qlocalsocket \ - qtcpserver \ - qsocks5socketengine \ - qabstractsocket \ - platformsocketengine \ - qsctpsocket \ - -android: SUBDIRS -= \ - # QTBUG-87387 - qlocalsocket \ - # QTBUG-87388 - qtcpserver - -!qtConfig(private_tests): SUBDIRS -= \ - platformsocketengine \ - qtcpsocket \ - qhttpsocketengine \ - qsocks5socketengine \ - -!qtConfig(sctp): SUBDIRS -= \ - qsctpsocket \ -- cgit v1.2.3