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 --- tests/auto/corelib/global/global.pro | 19 ---------------- .../corelib/global/q_func_info/q_func_info.pro | 4 ---- tests/auto/corelib/global/qcompare/qcompare.pro | 8 ------- tests/auto/corelib/global/qflags/qflags.pro | 6 ------ tests/auto/corelib/global/qfloat16/qfloat16.pro | 4 ---- .../auto/corelib/global/qgetputenv/qgetputenv.pro | 4 ---- tests/auto/corelib/global/qglobal/qglobal.pro | 7 ------ .../corelib/global/qglobalstatic/qglobalstatic.pro | 11 ---------- tests/auto/corelib/global/qhooks/qhooks.pro | 4 ---- .../global/qkeycombination/qkeycombination.pro | 5 ----- tests/auto/corelib/global/qlogging/app/app.pro | 25 ---------------------- tests/auto/corelib/global/qlogging/qlogging.pro | 8 ------- tests/auto/corelib/global/qlogging/test/test.pro | 22 ------------------- .../test_qmessagelogger/test_qmessagelogger.pro | 17 --------------- tests/auto/corelib/global/qnumeric/qnumeric.pro | 6 ------ .../qoperatingsystemversion.pro | 7 ------ .../global/qrandomgenerator/qrandomgenerator.pro | 4 ---- tests/auto/corelib/global/qtendian/qtendian.pro | 4 ---- .../corelib/global/qwinregistry/qwinregistry.pro | 8 ------- 19 files changed, 173 deletions(-) delete mode 100644 tests/auto/corelib/global/global.pro delete mode 100644 tests/auto/corelib/global/q_func_info/q_func_info.pro delete mode 100644 tests/auto/corelib/global/qcompare/qcompare.pro delete mode 100644 tests/auto/corelib/global/qflags/qflags.pro delete mode 100644 tests/auto/corelib/global/qfloat16/qfloat16.pro delete mode 100644 tests/auto/corelib/global/qgetputenv/qgetputenv.pro delete mode 100644 tests/auto/corelib/global/qglobal/qglobal.pro delete mode 100644 tests/auto/corelib/global/qglobalstatic/qglobalstatic.pro delete mode 100644 tests/auto/corelib/global/qhooks/qhooks.pro delete mode 100644 tests/auto/corelib/global/qkeycombination/qkeycombination.pro delete mode 100644 tests/auto/corelib/global/qlogging/app/app.pro delete mode 100644 tests/auto/corelib/global/qlogging/qlogging.pro delete mode 100644 tests/auto/corelib/global/qlogging/test/test.pro delete mode 100644 tests/auto/corelib/global/qlogging/test_qmessagelogger/test_qmessagelogger.pro delete mode 100644 tests/auto/corelib/global/qnumeric/qnumeric.pro delete mode 100644 tests/auto/corelib/global/qoperatingsystemversion/qoperatingsystemversion.pro delete mode 100644 tests/auto/corelib/global/qrandomgenerator/qrandomgenerator.pro delete mode 100644 tests/auto/corelib/global/qtendian/qtendian.pro delete mode 100644 tests/auto/corelib/global/qwinregistry/qwinregistry.pro (limited to 'tests/auto/corelib/global') diff --git a/tests/auto/corelib/global/global.pro b/tests/auto/corelib/global/global.pro deleted file mode 100644 index b3f3be08a5..0000000000 --- a/tests/auto/corelib/global/global.pro +++ /dev/null @@ -1,19 +0,0 @@ -TEMPLATE=subdirs -SUBDIRS=\ - qcompare \ - qflags \ - q_func_info \ - qgetputenv \ - qglobal \ - qnumeric \ - qfloat16 \ - qkeycombination \ - qrandomgenerator \ - qlogging \ - qtendian \ - qglobalstatic \ - qhooks \ - qoperatingsystemversion - -win32: SUBDIRS += \ - qwinregistry diff --git a/tests/auto/corelib/global/q_func_info/q_func_info.pro b/tests/auto/corelib/global/q_func_info/q_func_info.pro deleted file mode 100644 index 7663a880eb..0000000000 --- a/tests/auto/corelib/global/q_func_info/q_func_info.pro +++ /dev/null @@ -1,4 +0,0 @@ -CONFIG += testcase -TARGET = tst_q_func_info -QT = core testlib -SOURCES = tst_q_func_info.cpp diff --git a/tests/auto/corelib/global/qcompare/qcompare.pro b/tests/auto/corelib/global/qcompare/qcompare.pro deleted file mode 100644 index 0e2cd2771c..0000000000 --- a/tests/auto/corelib/global/qcompare/qcompare.pro +++ /dev/null @@ -1,8 +0,0 @@ -CONFIG += testcase -TARGET = tst_qcompare -QT = core testlib -SOURCES = tst_qcompare.cpp -qtConfig(c++11): CONFIG += c++11 -qtConfig(c++14): CONFIG += c++14 -qtConfig(c++17): CONFIG += c++17 -qtConfig(c++2a): CONFIG += c++2a diff --git a/tests/auto/corelib/global/qflags/qflags.pro b/tests/auto/corelib/global/qflags/qflags.pro deleted file mode 100644 index c3c11fa81b..0000000000 --- a/tests/auto/corelib/global/qflags/qflags.pro +++ /dev/null @@ -1,6 +0,0 @@ -CONFIG += testcase -TARGET = tst_qflags -QT = core testlib -SOURCES = tst_qflags.cpp -qtConfig(c++11): CONFIG += c++11 -qtConfig(c++14): CONFIG += c++14 diff --git a/tests/auto/corelib/global/qfloat16/qfloat16.pro b/tests/auto/corelib/global/qfloat16/qfloat16.pro deleted file mode 100644 index 42081181b4..0000000000 --- a/tests/auto/corelib/global/qfloat16/qfloat16.pro +++ /dev/null @@ -1,4 +0,0 @@ -CONFIG += testcase -TARGET = tst_qfloat16 -QT = core testlib -SOURCES = tst_qfloat16.cpp diff --git a/tests/auto/corelib/global/qgetputenv/qgetputenv.pro b/tests/auto/corelib/global/qgetputenv/qgetputenv.pro deleted file mode 100644 index c6d1100335..0000000000 --- a/tests/auto/corelib/global/qgetputenv/qgetputenv.pro +++ /dev/null @@ -1,4 +0,0 @@ -CONFIG += testcase -TARGET = tst_qgetputenv -QT = core testlib -SOURCES = tst_qgetputenv.cpp diff --git a/tests/auto/corelib/global/qglobal/qglobal.pro b/tests/auto/corelib/global/qglobal/qglobal.pro deleted file mode 100644 index e4453affa5..0000000000 --- a/tests/auto/corelib/global/qglobal/qglobal.pro +++ /dev/null @@ -1,7 +0,0 @@ -CONFIG += testcase -TARGET = tst_qglobal -QT = core testlib -SOURCES = tst_qglobal.cpp qglobal.c -qtConfig(c++11): CONFIG += c++11 -qtConfig(c++14): CONFIG += c++14 -qtConfig(c++1z): CONFIG += c++1z diff --git a/tests/auto/corelib/global/qglobalstatic/qglobalstatic.pro b/tests/auto/corelib/global/qglobalstatic/qglobalstatic.pro deleted file mode 100644 index 21bb040b8d..0000000000 --- a/tests/auto/corelib/global/qglobalstatic/qglobalstatic.pro +++ /dev/null @@ -1,11 +0,0 @@ -CONFIG += testcase -QT += testlib core-private - -QT -= gui - -TARGET = tst_qglobalstatic -CONFIG += console -CONFIG += exceptions - -SOURCES += tst_qglobalstatic.cpp -DEFINES += SRCDIR=\\\"$$PWD/\\\" diff --git a/tests/auto/corelib/global/qhooks/qhooks.pro b/tests/auto/corelib/global/qhooks/qhooks.pro deleted file mode 100644 index a5c0d63cb9..0000000000 --- a/tests/auto/corelib/global/qhooks/qhooks.pro +++ /dev/null @@ -1,4 +0,0 @@ -CONFIG += testcase -TARGET = tst_qhooks -QT = core-private testlib -SOURCES = tst_qhooks.cpp diff --git a/tests/auto/corelib/global/qkeycombination/qkeycombination.pro b/tests/auto/corelib/global/qkeycombination/qkeycombination.pro deleted file mode 100644 index e2dd431055..0000000000 --- a/tests/auto/corelib/global/qkeycombination/qkeycombination.pro +++ /dev/null @@ -1,5 +0,0 @@ -CONFIG += testcase -TARGET = tst_qkeycombination -QT = core testlib -SOURCES = tst_qkeycombination.cpp - diff --git a/tests/auto/corelib/global/qlogging/app/app.pro b/tests/auto/corelib/global/qlogging/app/app.pro deleted file mode 100644 index 3ada382ff4..0000000000 --- a/tests/auto/corelib/global/qlogging/app/app.pro +++ /dev/null @@ -1,25 +0,0 @@ -TEMPLATE = app - -debug_and_release { - CONFIG(debug, debug|release) { - TARGET = ../debug/helper - } else { - TARGET = ../release/helper - } -} else { - TARGET = ../helper -} - -QT = core - -DESTDIR = ./ - -CONFIG += cmdline - -SOURCES += main.cpp -DEFINES += QT_MESSAGELOGCONTEXT - -gcc:!mingw:!haiku { - QMAKE_LFLAGS += -rdynamic - contains(QT_ARCH, arm): QMAKE_CXXFLAGS += -funwind-tables -fno-inline -} diff --git a/tests/auto/corelib/global/qlogging/qlogging.pro b/tests/auto/corelib/global/qlogging/qlogging.pro deleted file mode 100644 index 86396cf51c..0000000000 --- a/tests/auto/corelib/global/qlogging/qlogging.pro +++ /dev/null @@ -1,8 +0,0 @@ -TEMPLATE = subdirs - -test.depends = app -SUBDIRS += app - -SUBDIRS += test - -SUBDIRS += test_qmessagelogger diff --git a/tests/auto/corelib/global/qlogging/test/test.pro b/tests/auto/corelib/global/qlogging/test/test.pro deleted file mode 100644 index c6c5950ff1..0000000000 --- a/tests/auto/corelib/global/qlogging/test/test.pro +++ /dev/null @@ -1,22 +0,0 @@ -CONFIG += testcase -qtConfig(c++11): CONFIG += c++11 -qtConfig(c++14): CONFIG += c++14 -debug_and_release { - CONFIG(debug, debug|release) { - TARGET = ../../debug/tst_qlogging - !android: TEST_HELPER_INSTALLS = ../debug/helper - } else { - TARGET = ../../release/tst_qlogging - !android: TEST_HELPER_INSTALLS = ../release/helper - } -} else { - TARGET = ../tst_qlogging - !android: TEST_HELPER_INSTALLS = ../helper -} - -QT = core testlib -SOURCES = ../tst_qlogging.cpp - -DEFINES += QT_MESSAGELOGCONTEXT -DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 -DEFINES += HELPER_BINARY=\\\"helper\\\" diff --git a/tests/auto/corelib/global/qlogging/test_qmessagelogger/test_qmessagelogger.pro b/tests/auto/corelib/global/qlogging/test_qmessagelogger/test_qmessagelogger.pro deleted file mode 100644 index 6f2cea20ad..0000000000 --- a/tests/auto/corelib/global/qlogging/test_qmessagelogger/test_qmessagelogger.pro +++ /dev/null @@ -1,17 +0,0 @@ -CONFIG += testcase -qtConfig(c++17): CONFIG += c++17 -debug_and_release { - CONFIG(debug, debug|release) { - TARGET = ../../debug/tst_qmessagelogger - } else { - TARGET = ../../release/tst_qmessagelogger - } -} else { - TARGET = ../tst_qmessagelogger -} - -QT = core testlib -SOURCES = ../tst_qmessagelogger.cpp - -DEFINES += QT_MESSAGELOGCONTEXT -DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/corelib/global/qnumeric/qnumeric.pro b/tests/auto/corelib/global/qnumeric/qnumeric.pro deleted file mode 100644 index 188bb5b463..0000000000 --- a/tests/auto/corelib/global/qnumeric/qnumeric.pro +++ /dev/null @@ -1,6 +0,0 @@ -CONFIG += testcase -TARGET = tst_qnumeric -QT = core-private testlib -SOURCES = tst_qnumeric.cpp -intel_icc: QMAKE_CXXFLAGS += -fp-model strict -intel_icl: QMAKE_CXXFLAGS += /fp:strict diff --git a/tests/auto/corelib/global/qoperatingsystemversion/qoperatingsystemversion.pro b/tests/auto/corelib/global/qoperatingsystemversion/qoperatingsystemversion.pro deleted file mode 100644 index f9384643ef..0000000000 --- a/tests/auto/corelib/global/qoperatingsystemversion/qoperatingsystemversion.pro +++ /dev/null @@ -1,7 +0,0 @@ -CONFIG += testcase -TARGET = tst_qoperatingsystemversion -QT = core testlib -SOURCES = tst_qoperatingsystemversion.cpp -qtConfig(c++11): CONFIG += c++11 -qtConfig(c++14): CONFIG += c++14 -qtConfig(c++1z): CONFIG += c++1z diff --git a/tests/auto/corelib/global/qrandomgenerator/qrandomgenerator.pro b/tests/auto/corelib/global/qrandomgenerator/qrandomgenerator.pro deleted file mode 100644 index 0307b0c1eb..0000000000 --- a/tests/auto/corelib/global/qrandomgenerator/qrandomgenerator.pro +++ /dev/null @@ -1,4 +0,0 @@ -CONFIG += testcase -TARGET = tst_qrandomgenerator -QT = core-private testlib -SOURCES = tst_qrandomgenerator.cpp diff --git a/tests/auto/corelib/global/qtendian/qtendian.pro b/tests/auto/corelib/global/qtendian/qtendian.pro deleted file mode 100644 index 890976d26c..0000000000 --- a/tests/auto/corelib/global/qtendian/qtendian.pro +++ /dev/null @@ -1,4 +0,0 @@ -CONFIG += testcase -TARGET = tst_qtendian -QT = core core-private testlib -SOURCES = tst_qtendian.cpp diff --git a/tests/auto/corelib/global/qwinregistry/qwinregistry.pro b/tests/auto/corelib/global/qwinregistry/qwinregistry.pro deleted file mode 100644 index eab5df9dc3..0000000000 --- a/tests/auto/corelib/global/qwinregistry/qwinregistry.pro +++ /dev/null @@ -1,8 +0,0 @@ -CONFIG += testcase -QT += testlib core-private -QT -= gui - -TARGET = tst_qwinregistry -CONFIG += console - -SOURCES += tst_qwinregistry.cpp -- cgit v1.2.3