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 --- .../fileWriterProcess/fileWriterProcess.pro | 4 ---- tests/auto/corelib/io/qprocess/qprocess.pri | 22 ---------------------- tests/auto/corelib/io/qprocess/qprocess.pro | 18 ------------------ tests/auto/corelib/io/qprocess/test/test.pro | 22 ---------------------- .../io/qprocess/testDetached/testDetached.pro | 5 ----- .../io/qprocess/testExitCodes/testExitCodes.pro | 5 ----- .../io/qprocess/testForwarding/testForwarding.pro | 4 ---- .../testForwardingHelper/testForwardingHelper.pro | 4 ---- .../io/qprocess/testGuiProcess/testGuiProcess.pro | 4 ---- .../qprocess/testProcessCrash/testProcessCrash.pro | 5 ----- .../testProcessDeadWhileReading.pro | 5 ----- .../io/qprocess/testProcessEOF/testProcessEOF.pro | 4 ---- .../qprocess/testProcessEcho/testProcessEcho.pro | 4 ---- .../qprocess/testProcessEcho2/testProcessEcho2.pro | 4 ---- .../qprocess/testProcessEcho3/testProcessEcho3.pro | 4 ---- .../testProcessEchoGui/testProcessEchoGui.pro | 8 -------- .../testProcessEnvironment.pro | 4 ---- .../qprocess/testProcessHang/testProcessHang.pro | 4 ---- .../testProcessNormal/testProcessNormal.pro | 6 ------ .../testProcessOutput/testProcessOutput.pro | 5 ----- .../io/qprocess/testProcessSpacesArgs/nospace.pro | 6 ------ .../io/qprocess/testProcessSpacesArgs/onespace.pro | 8 -------- .../qprocess/testProcessSpacesArgs/twospaces.pro | 9 --------- .../testSetNamedPipeHandleState.pro | 4 ---- .../testSetWorkingDirectory.pro | 4 ---- .../io/qprocess/testSoftExit/testSoftExit.pro | 12 ------------ .../qprocess/testSpaceInName/testSpaceInName.pro | 5 ----- 27 files changed, 189 deletions(-) delete mode 100644 tests/auto/corelib/io/qprocess/fileWriterProcess/fileWriterProcess.pro delete mode 100644 tests/auto/corelib/io/qprocess/qprocess.pri delete mode 100644 tests/auto/corelib/io/qprocess/qprocess.pro delete mode 100644 tests/auto/corelib/io/qprocess/test/test.pro delete mode 100644 tests/auto/corelib/io/qprocess/testDetached/testDetached.pro delete mode 100644 tests/auto/corelib/io/qprocess/testExitCodes/testExitCodes.pro delete mode 100644 tests/auto/corelib/io/qprocess/testForwarding/testForwarding.pro delete mode 100644 tests/auto/corelib/io/qprocess/testForwardingHelper/testForwardingHelper.pro delete mode 100644 tests/auto/corelib/io/qprocess/testGuiProcess/testGuiProcess.pro delete mode 100644 tests/auto/corelib/io/qprocess/testProcessCrash/testProcessCrash.pro delete mode 100644 tests/auto/corelib/io/qprocess/testProcessDeadWhileReading/testProcessDeadWhileReading.pro delete mode 100644 tests/auto/corelib/io/qprocess/testProcessEOF/testProcessEOF.pro delete mode 100644 tests/auto/corelib/io/qprocess/testProcessEcho/testProcessEcho.pro delete mode 100644 tests/auto/corelib/io/qprocess/testProcessEcho2/testProcessEcho2.pro delete mode 100644 tests/auto/corelib/io/qprocess/testProcessEcho3/testProcessEcho3.pro delete mode 100644 tests/auto/corelib/io/qprocess/testProcessEchoGui/testProcessEchoGui.pro delete mode 100644 tests/auto/corelib/io/qprocess/testProcessEnvironment/testProcessEnvironment.pro delete mode 100644 tests/auto/corelib/io/qprocess/testProcessHang/testProcessHang.pro delete mode 100644 tests/auto/corelib/io/qprocess/testProcessNormal/testProcessNormal.pro delete mode 100644 tests/auto/corelib/io/qprocess/testProcessOutput/testProcessOutput.pro delete mode 100644 tests/auto/corelib/io/qprocess/testProcessSpacesArgs/nospace.pro delete mode 100644 tests/auto/corelib/io/qprocess/testProcessSpacesArgs/onespace.pro delete mode 100644 tests/auto/corelib/io/qprocess/testProcessSpacesArgs/twospaces.pro delete mode 100644 tests/auto/corelib/io/qprocess/testSetNamedPipeHandleState/testSetNamedPipeHandleState.pro delete mode 100644 tests/auto/corelib/io/qprocess/testSetWorkingDirectory/testSetWorkingDirectory.pro delete mode 100644 tests/auto/corelib/io/qprocess/testSoftExit/testSoftExit.pro delete mode 100644 tests/auto/corelib/io/qprocess/testSpaceInName/testSpaceInName.pro (limited to 'tests/auto/corelib/io/qprocess') diff --git a/tests/auto/corelib/io/qprocess/fileWriterProcess/fileWriterProcess.pro b/tests/auto/corelib/io/qprocess/fileWriterProcess/fileWriterProcess.pro deleted file mode 100644 index 2744491151..0000000000 --- a/tests/auto/corelib/io/qprocess/fileWriterProcess/fileWriterProcess.pro +++ /dev/null @@ -1,4 +0,0 @@ -SOURCES = main.cpp -CONFIG += cmdline -QT = core -DESTDIR = ./ diff --git a/tests/auto/corelib/io/qprocess/qprocess.pri b/tests/auto/corelib/io/qprocess/qprocess.pri deleted file mode 100644 index 8d17090545..0000000000 --- a/tests/auto/corelib/io/qprocess/qprocess.pri +++ /dev/null @@ -1,22 +0,0 @@ -SUBPROGRAMS = \ - testProcessCrash \ - testProcessEcho \ - testProcessEcho2 \ - testProcessEcho3 \ - testProcessEnvironment \ - testProcessHang \ - testProcessNormal \ - testProcessOutput \ - testProcessDeadWhileReading \ - testProcessEOF \ - testExitCodes \ - testForwarding \ - testForwardingHelper \ - testGuiProcess \ - testDetached \ - fileWriterProcess \ - testSetWorkingDirectory \ - testSoftExit - -!qtHaveModule(widgets): SUBPROGRAMS -= \ - testGuiProcess diff --git a/tests/auto/corelib/io/qprocess/qprocess.pro b/tests/auto/corelib/io/qprocess/qprocess.pro deleted file mode 100644 index 3867ac5741..0000000000 --- a/tests/auto/corelib/io/qprocess/qprocess.pro +++ /dev/null @@ -1,18 +0,0 @@ -TEMPLATE = subdirs - -include(qprocess.pri) -SUBDIRS = $$SUBPROGRAMS -# Add special cases -SUBDIRS += testProcessSpacesArgs/nospace.pro \ - testProcessSpacesArgs/onespace.pro \ - testProcessSpacesArgs/twospaces.pro \ - testSpaceInName - -win32 { - SUBDIRS += \ - testProcessEchoGui \ - testSetNamedPipeHandleState -} - -test.depends += $$SUBDIRS -SUBDIRS += test diff --git a/tests/auto/corelib/io/qprocess/test/test.pro b/tests/auto/corelib/io/qprocess/test/test.pro deleted file mode 100644 index 63187c9668..0000000000 --- a/tests/auto/corelib/io/qprocess/test/test.pro +++ /dev/null @@ -1,22 +0,0 @@ -CONFIG += testcase -CONFIG -= debug_and_release_target -QT = core-private testlib network -SOURCES = ../tst_qprocess.cpp -INCLUDEPATH += ../../../../../shared -HEADERS += ../../../../../shared/emulationdetector.h - -TARGET = ../tst_qprocess - -win32:TESTDATA += ../testBatFiles/* - -include(../qprocess.pri) - -mac:CONFIG += insignificant_test # QTBUG-25895 - sometimes hangs - -for(file, SUBPROGRAMS): TEST_HELPER_INSTALLS += "../$${file}/$${file}" - -TEST_HELPER_INSTALLS += \ - ../testProcessSpacesArgs/nospace \ - "../testProcessSpacesArgs/one space" \ - "../testProcessSpacesArgs/two space s" \ - "../test Space In Name/testSpaceInName" diff --git a/tests/auto/corelib/io/qprocess/testDetached/testDetached.pro b/tests/auto/corelib/io/qprocess/testDetached/testDetached.pro deleted file mode 100644 index 3d80b668df..0000000000 --- a/tests/auto/corelib/io/qprocess/testDetached/testDetached.pro +++ /dev/null @@ -1,5 +0,0 @@ -SOURCES = main.cpp -QT = core -CONFIG += cmdline -INSTALLS = -DESTDIR = ./ diff --git a/tests/auto/corelib/io/qprocess/testExitCodes/testExitCodes.pro b/tests/auto/corelib/io/qprocess/testExitCodes/testExitCodes.pro deleted file mode 100644 index 5eaf8dc881..0000000000 --- a/tests/auto/corelib/io/qprocess/testExitCodes/testExitCodes.pro +++ /dev/null @@ -1,5 +0,0 @@ -SOURCES += main.cpp -CONFIG -= qt -CONFIG += cmdline - -DESTDIR = ./ diff --git a/tests/auto/corelib/io/qprocess/testForwarding/testForwarding.pro b/tests/auto/corelib/io/qprocess/testForwarding/testForwarding.pro deleted file mode 100644 index 4d91e0cf36..0000000000 --- a/tests/auto/corelib/io/qprocess/testForwarding/testForwarding.pro +++ /dev/null @@ -1,4 +0,0 @@ -SOURCES = main.cpp -CONFIG += cmdline -DESTDIR = ./ -QT = core diff --git a/tests/auto/corelib/io/qprocess/testForwardingHelper/testForwardingHelper.pro b/tests/auto/corelib/io/qprocess/testForwardingHelper/testForwardingHelper.pro deleted file mode 100644 index 6a23e52d95..0000000000 --- a/tests/auto/corelib/io/qprocess/testForwardingHelper/testForwardingHelper.pro +++ /dev/null @@ -1,4 +0,0 @@ -SOURCES = main.cpp -CONFIG -= qt -CONFIG += cmdline -DESTDIR = ./ diff --git a/tests/auto/corelib/io/qprocess/testGuiProcess/testGuiProcess.pro b/tests/auto/corelib/io/qprocess/testGuiProcess/testGuiProcess.pro deleted file mode 100644 index ef438d6399..0000000000 --- a/tests/auto/corelib/io/qprocess/testGuiProcess/testGuiProcess.pro +++ /dev/null @@ -1,4 +0,0 @@ -SOURCES += main.cpp -QT += widgets -CONFIG += cmdline -DESTDIR = ./ diff --git a/tests/auto/corelib/io/qprocess/testProcessCrash/testProcessCrash.pro b/tests/auto/corelib/io/qprocess/testProcessCrash/testProcessCrash.pro deleted file mode 100644 index 640ce4cd09..0000000000 --- a/tests/auto/corelib/io/qprocess/testProcessCrash/testProcessCrash.pro +++ /dev/null @@ -1,5 +0,0 @@ -SOURCES = main.cpp -CONFIG += cmdline -CONFIG -= qt - -DESTDIR = ./ diff --git a/tests/auto/corelib/io/qprocess/testProcessDeadWhileReading/testProcessDeadWhileReading.pro b/tests/auto/corelib/io/qprocess/testProcessDeadWhileReading/testProcessDeadWhileReading.pro deleted file mode 100644 index c7be60a82d..0000000000 --- a/tests/auto/corelib/io/qprocess/testProcessDeadWhileReading/testProcessDeadWhileReading.pro +++ /dev/null @@ -1,5 +0,0 @@ -SOURCES = main.cpp -CONFIG -= qt -CONFIG += cmdline - -DESTDIR = ./ diff --git a/tests/auto/corelib/io/qprocess/testProcessEOF/testProcessEOF.pro b/tests/auto/corelib/io/qprocess/testProcessEOF/testProcessEOF.pro deleted file mode 100644 index 6a23e52d95..0000000000 --- a/tests/auto/corelib/io/qprocess/testProcessEOF/testProcessEOF.pro +++ /dev/null @@ -1,4 +0,0 @@ -SOURCES = main.cpp -CONFIG -= qt -CONFIG += cmdline -DESTDIR = ./ diff --git a/tests/auto/corelib/io/qprocess/testProcessEcho/testProcessEcho.pro b/tests/auto/corelib/io/qprocess/testProcessEcho/testProcessEcho.pro deleted file mode 100644 index 6a23e52d95..0000000000 --- a/tests/auto/corelib/io/qprocess/testProcessEcho/testProcessEcho.pro +++ /dev/null @@ -1,4 +0,0 @@ -SOURCES = main.cpp -CONFIG -= qt -CONFIG += cmdline -DESTDIR = ./ diff --git a/tests/auto/corelib/io/qprocess/testProcessEcho2/testProcessEcho2.pro b/tests/auto/corelib/io/qprocess/testProcessEcho2/testProcessEcho2.pro deleted file mode 100644 index 6a23e52d95..0000000000 --- a/tests/auto/corelib/io/qprocess/testProcessEcho2/testProcessEcho2.pro +++ /dev/null @@ -1,4 +0,0 @@ -SOURCES = main.cpp -CONFIG -= qt -CONFIG += cmdline -DESTDIR = ./ diff --git a/tests/auto/corelib/io/qprocess/testProcessEcho3/testProcessEcho3.pro b/tests/auto/corelib/io/qprocess/testProcessEcho3/testProcessEcho3.pro deleted file mode 100644 index 6a23e52d95..0000000000 --- a/tests/auto/corelib/io/qprocess/testProcessEcho3/testProcessEcho3.pro +++ /dev/null @@ -1,4 +0,0 @@ -SOURCES = main.cpp -CONFIG -= qt -CONFIG += cmdline -DESTDIR = ./ diff --git a/tests/auto/corelib/io/qprocess/testProcessEchoGui/testProcessEchoGui.pro b/tests/auto/corelib/io/qprocess/testProcessEchoGui/testProcessEchoGui.pro deleted file mode 100644 index 935f43630c..0000000000 --- a/tests/auto/corelib/io/qprocess/testProcessEchoGui/testProcessEchoGui.pro +++ /dev/null @@ -1,8 +0,0 @@ -win32 { - SOURCES = main_win.cpp - LIBS += -luser32 -} - -CONFIG -= qt app_bundle -DESTDIR = ./ -DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/corelib/io/qprocess/testProcessEnvironment/testProcessEnvironment.pro b/tests/auto/corelib/io/qprocess/testProcessEnvironment/testProcessEnvironment.pro deleted file mode 100644 index 6a23e52d95..0000000000 --- a/tests/auto/corelib/io/qprocess/testProcessEnvironment/testProcessEnvironment.pro +++ /dev/null @@ -1,4 +0,0 @@ -SOURCES = main.cpp -CONFIG -= qt -CONFIG += cmdline -DESTDIR = ./ diff --git a/tests/auto/corelib/io/qprocess/testProcessHang/testProcessHang.pro b/tests/auto/corelib/io/qprocess/testProcessHang/testProcessHang.pro deleted file mode 100644 index 6a23e52d95..0000000000 --- a/tests/auto/corelib/io/qprocess/testProcessHang/testProcessHang.pro +++ /dev/null @@ -1,4 +0,0 @@ -SOURCES = main.cpp -CONFIG -= qt -CONFIG += cmdline -DESTDIR = ./ diff --git a/tests/auto/corelib/io/qprocess/testProcessNormal/testProcessNormal.pro b/tests/auto/corelib/io/qprocess/testProcessNormal/testProcessNormal.pro deleted file mode 100644 index 7e1119c117..0000000000 --- a/tests/auto/corelib/io/qprocess/testProcessNormal/testProcessNormal.pro +++ /dev/null @@ -1,6 +0,0 @@ -SOURCES = main.cpp -CONFIG += cmdline -CONFIG -= qt - -DESTDIR = ./ -QT = core diff --git a/tests/auto/corelib/io/qprocess/testProcessOutput/testProcessOutput.pro b/tests/auto/corelib/io/qprocess/testProcessOutput/testProcessOutput.pro deleted file mode 100644 index 0bbb6b3c0e..0000000000 --- a/tests/auto/corelib/io/qprocess/testProcessOutput/testProcessOutput.pro +++ /dev/null @@ -1,5 +0,0 @@ -SOURCES = main.cpp -CONFIG -= qt -CONFIG += cmdline -DESTDIR = ./ -QT = core diff --git a/tests/auto/corelib/io/qprocess/testProcessSpacesArgs/nospace.pro b/tests/auto/corelib/io/qprocess/testProcessSpacesArgs/nospace.pro deleted file mode 100644 index 7954a2f74b..0000000000 --- a/tests/auto/corelib/io/qprocess/testProcessSpacesArgs/nospace.pro +++ /dev/null @@ -1,6 +0,0 @@ -SOURCES = main.cpp -CONFIG -= qt -CONFIG += cmdline -DESTDIR = ./ -OBJECTS_DIR = $${OBJECTS_DIR}-nospace -DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/corelib/io/qprocess/testProcessSpacesArgs/onespace.pro b/tests/auto/corelib/io/qprocess/testProcessSpacesArgs/onespace.pro deleted file mode 100644 index 44a365c9a5..0000000000 --- a/tests/auto/corelib/io/qprocess/testProcessSpacesArgs/onespace.pro +++ /dev/null @@ -1,8 +0,0 @@ -SOURCES = main.cpp -CONFIG -= qt -CONFIG += cmdline -DESTDIR = ./ -OBJECTS_DIR = $${OBJECTS_DIR}-onespace - -TARGET = "one space" -DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/corelib/io/qprocess/testProcessSpacesArgs/twospaces.pro b/tests/auto/corelib/io/qprocess/testProcessSpacesArgs/twospaces.pro deleted file mode 100644 index bd2db9fb6d..0000000000 --- a/tests/auto/corelib/io/qprocess/testProcessSpacesArgs/twospaces.pro +++ /dev/null @@ -1,9 +0,0 @@ -SOURCES = main.cpp -CONFIG -= qt -CONFIG += cmdline -DESTDIR = ./ -OBJECTS_DIR = $${OBJECTS_DIR}-twospaces - -TARGET = "two space s" -DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 -QT = core diff --git a/tests/auto/corelib/io/qprocess/testSetNamedPipeHandleState/testSetNamedPipeHandleState.pro b/tests/auto/corelib/io/qprocess/testSetNamedPipeHandleState/testSetNamedPipeHandleState.pro deleted file mode 100644 index 6a23e52d95..0000000000 --- a/tests/auto/corelib/io/qprocess/testSetNamedPipeHandleState/testSetNamedPipeHandleState.pro +++ /dev/null @@ -1,4 +0,0 @@ -SOURCES = main.cpp -CONFIG -= qt -CONFIG += cmdline -DESTDIR = ./ diff --git a/tests/auto/corelib/io/qprocess/testSetWorkingDirectory/testSetWorkingDirectory.pro b/tests/auto/corelib/io/qprocess/testSetWorkingDirectory/testSetWorkingDirectory.pro deleted file mode 100644 index 4d91e0cf36..0000000000 --- a/tests/auto/corelib/io/qprocess/testSetWorkingDirectory/testSetWorkingDirectory.pro +++ /dev/null @@ -1,4 +0,0 @@ -SOURCES = main.cpp -CONFIG += cmdline -DESTDIR = ./ -QT = core diff --git a/tests/auto/corelib/io/qprocess/testSoftExit/testSoftExit.pro b/tests/auto/corelib/io/qprocess/testSoftExit/testSoftExit.pro deleted file mode 100644 index 2cfcb4794e..0000000000 --- a/tests/auto/corelib/io/qprocess/testSoftExit/testSoftExit.pro +++ /dev/null @@ -1,12 +0,0 @@ -win32 { - SOURCES = main_win.cpp - LIBS += -luser32 -} -unix { - SOURCES = main_unix.cpp -} - -CONFIG -= qt -CONFIG += cmdline -DESTDIR = ./ -QT = core diff --git a/tests/auto/corelib/io/qprocess/testSpaceInName/testSpaceInName.pro b/tests/auto/corelib/io/qprocess/testSpaceInName/testSpaceInName.pro deleted file mode 100644 index 48f28c4c8b..0000000000 --- a/tests/auto/corelib/io/qprocess/testSpaceInName/testSpaceInName.pro +++ /dev/null @@ -1,5 +0,0 @@ -SOURCES = main.cpp -CONFIG -= qt -CONFIG += cmdline -DESTDIR = "../test Space In Name" -QT = core -- cgit v1.2.3