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 --- .../cmake/mockplugins/mock1plugin/mock1plugin.pro | 9 ------ .../cmake/mockplugins/mock2plugin/mock2plugin.pro | 10 ------ .../cmake/mockplugins/mock3plugin/mock3plugin.pro | 10 ------ .../cmake/mockplugins/mock4plugin/mock4plugin.pro | 10 ------ .../cmake/mockplugins/mock5plugin/mock5plugin.pro | 10 ------ .../cmake/mockplugins/mock6plugin/mock6plugin.pro | 9 ------ tests/auto/cmake/mockplugins/mockplugins.pro | 36 ---------------------- .../mockplugins/mockplugins1/mockplugins1.pro | 10 ------ .../mockplugins/mockplugins2/mockplugins2.pro | 4 --- .../mockplugins/mockplugins3/mockplugins3.pro | 11 ------- 10 files changed, 119 deletions(-) delete mode 100644 tests/auto/cmake/mockplugins/mock1plugin/mock1plugin.pro delete mode 100644 tests/auto/cmake/mockplugins/mock2plugin/mock2plugin.pro delete mode 100644 tests/auto/cmake/mockplugins/mock3plugin/mock3plugin.pro delete mode 100644 tests/auto/cmake/mockplugins/mock4plugin/mock4plugin.pro delete mode 100644 tests/auto/cmake/mockplugins/mock5plugin/mock5plugin.pro delete mode 100644 tests/auto/cmake/mockplugins/mock6plugin/mock6plugin.pro delete mode 100644 tests/auto/cmake/mockplugins/mockplugins.pro delete mode 100644 tests/auto/cmake/mockplugins/mockplugins1/mockplugins1.pro delete mode 100644 tests/auto/cmake/mockplugins/mockplugins2/mockplugins2.pro delete mode 100644 tests/auto/cmake/mockplugins/mockplugins3/mockplugins3.pro (limited to 'tests/auto/cmake/mockplugins') diff --git a/tests/auto/cmake/mockplugins/mock1plugin/mock1plugin.pro b/tests/auto/cmake/mockplugins/mock1plugin/mock1plugin.pro deleted file mode 100644 index 1ccbe924ae..0000000000 --- a/tests/auto/cmake/mockplugins/mock1plugin/mock1plugin.pro +++ /dev/null @@ -1,9 +0,0 @@ -TARGET = mock1plugin - -HEADERS += qmock1plugin.h -SOURCES += qmock1plugin.cpp -QT = mockplugins1 - -PLUGIN_TYPE = mockplugin -PLUGIN_CLASS_NAME = QMock1Plugin -load(qt_plugin) diff --git a/tests/auto/cmake/mockplugins/mock2plugin/mock2plugin.pro b/tests/auto/cmake/mockplugins/mock2plugin/mock2plugin.pro deleted file mode 100644 index 75dc21cf0a..0000000000 --- a/tests/auto/cmake/mockplugins/mock2plugin/mock2plugin.pro +++ /dev/null @@ -1,10 +0,0 @@ -TARGET = mock2plugin - -HEADERS += qmock2plugin.h -SOURCES += qmock2plugin.cpp -QT = mockplugins1 - -PLUGIN_TYPE = mockplugin -PLUGIN_CLASS_NAME = QMock2Plugin -PLUGIN_EXTENDS = mockplugins1 -load(qt_plugin) diff --git a/tests/auto/cmake/mockplugins/mock3plugin/mock3plugin.pro b/tests/auto/cmake/mockplugins/mock3plugin/mock3plugin.pro deleted file mode 100644 index ed7df603bb..0000000000 --- a/tests/auto/cmake/mockplugins/mock3plugin/mock3plugin.pro +++ /dev/null @@ -1,10 +0,0 @@ -TARGET = mock3plugin - -HEADERS += qmock3plugin.h -SOURCES += qmock3plugin.cpp -QT = mockplugins1 - -PLUGIN_TYPE = mockplugin -PLUGIN_CLASS_NAME = QMock3Plugin -PLUGIN_EXTENDS = mockplugins1 mockplugins2 -load(qt_plugin) diff --git a/tests/auto/cmake/mockplugins/mock4plugin/mock4plugin.pro b/tests/auto/cmake/mockplugins/mock4plugin/mock4plugin.pro deleted file mode 100644 index 4dd2d6c547..0000000000 --- a/tests/auto/cmake/mockplugins/mock4plugin/mock4plugin.pro +++ /dev/null @@ -1,10 +0,0 @@ -TARGET = mock4plugin - -HEADERS += qmock4plugin.h -SOURCES += qmock4plugin.cpp -QT = mockplugins1 - -PLUGIN_TYPE = mockplugin -PLUGIN_CLASS_NAME = QMock4Plugin -PLUGIN_EXTENDS = - -load(qt_plugin) diff --git a/tests/auto/cmake/mockplugins/mock5plugin/mock5plugin.pro b/tests/auto/cmake/mockplugins/mock5plugin/mock5plugin.pro deleted file mode 100644 index 29496868fe..0000000000 --- a/tests/auto/cmake/mockplugins/mock5plugin/mock5plugin.pro +++ /dev/null @@ -1,10 +0,0 @@ -TARGET = mock5plugin - -HEADERS += qmock5plugin.h -SOURCES += qmock5plugin.cpp -QT = mockplugins3 - -PLUGIN_TYPE = mockplugin -PLUGIN_CLASS_NAME = QMock5Plugin -PLUGIN_EXTENDS = - -load(qt_plugin) diff --git a/tests/auto/cmake/mockplugins/mock6plugin/mock6plugin.pro b/tests/auto/cmake/mockplugins/mock6plugin/mock6plugin.pro deleted file mode 100644 index 140f198811..0000000000 --- a/tests/auto/cmake/mockplugins/mock6plugin/mock6plugin.pro +++ /dev/null @@ -1,9 +0,0 @@ -TARGET = mock6plugin - -HEADERS += qmock6plugin.h -SOURCES += qmock6plugin.cpp -QT = mockplugins3 - -PLUGIN_TYPE = mockauxplugin -PLUGIN_CLASS_NAME = QMock6Plugin -load(qt_plugin) diff --git a/tests/auto/cmake/mockplugins/mockplugins.pro b/tests/auto/cmake/mockplugins/mockplugins.pro deleted file mode 100644 index 830d130a05..0000000000 --- a/tests/auto/cmake/mockplugins/mockplugins.pro +++ /dev/null @@ -1,36 +0,0 @@ -TEMPLATE = subdirs - -src_mock1plugin.subdir = $$PWD/mock1plugin -src_mock1plugin.target = sub-mockplugin1 -src_mock1plugin.depends = mockplugins1 - -src_mock2plugin.subdir = $$PWD/mock2plugin -src_mock2plugin.target = sub-mockplugin2 -src_mock2plugin.depends = mockplugins1 - -src_mock3plugin.subdir = $$PWD/mock3plugin -src_mock3plugin.target = sub-mockplugin3 -src_mock3plugin.depends = mockplugins1 - -src_mock4plugin.subdir = $$PWD/mock4plugin -src_mock4plugin.target = sub-mockplugin4 -src_mock4plugin.depends = mockplugins1 - -src_mock5plugin.subdir = $$PWD/mock5plugin -src_mock5plugin.target = sub-mockplugin5 -src_mock5plugin.depends = mockplugins3 - -src_mock6plugin.subdir = $$PWD/mock6plugin -src_mock6plugin.target = sub-mockplugin6 -src_mock6plugin.depends = mockplugins3 - -SUBDIRS += \ - mockplugins1 \ - mockplugins2 \ - mockplugins3 \ - src_mock1plugin \ - src_mock2plugin \ - src_mock3plugin \ - src_mock4plugin \ - src_mock5plugin \ - src_mock6plugin diff --git a/tests/auto/cmake/mockplugins/mockplugins1/mockplugins1.pro b/tests/auto/cmake/mockplugins/mockplugins1/mockplugins1.pro deleted file mode 100644 index dd98937ee3..0000000000 --- a/tests/auto/cmake/mockplugins/mockplugins1/mockplugins1.pro +++ /dev/null @@ -1,10 +0,0 @@ -TARGET = QtMockPlugins1 -QT = core -MODULE_PLUGIN_TYPES = mockplugin - -# Fake a git_build, to force qmake to run syncqt.pl when doing a standalone tests build -# like it is done in Coin, otherwise module headers would not be generated. -CONFIG += git_build -HEADERS += qmockplugin.h -SOURCES += fake.cpp # Needed to make libtool / ar happy on macOS -load(qt_module) diff --git a/tests/auto/cmake/mockplugins/mockplugins2/mockplugins2.pro b/tests/auto/cmake/mockplugins/mockplugins2/mockplugins2.pro deleted file mode 100644 index 1dd03391e8..0000000000 --- a/tests/auto/cmake/mockplugins/mockplugins2/mockplugins2.pro +++ /dev/null @@ -1,4 +0,0 @@ -TARGET = QtMockPlugins2 -QT = core -SOURCES += fake.cpp # Needed to make libtool / ar happy on macOS -load(qt_module) diff --git a/tests/auto/cmake/mockplugins/mockplugins3/mockplugins3.pro b/tests/auto/cmake/mockplugins/mockplugins3/mockplugins3.pro deleted file mode 100644 index 3651abaafa..0000000000 --- a/tests/auto/cmake/mockplugins/mockplugins3/mockplugins3.pro +++ /dev/null @@ -1,11 +0,0 @@ -TARGET = QtMockPlugins3 -QT = core -MODULE_PLUGIN_TYPES = mockauxplugin - -# Fake a git_build, to force qmake to run syncqt.pl when doing a standalone tests build -# like it is done in Coin, otherwise module headers would not be generated. -CONFIG += git_build -HEADERS += qmockauxplugin.h -SOURCES += fake.cpp # Needed to make libtool / ar happy on macOS - -load(qt_module) -- cgit v1.2.3