summaryrefslogtreecommitdiffstats
path: root/tests/auto/corelib/plugin
diff options
context:
space:
mode:
authorJoerg Bornemann <joerg.bornemann@qt.io>2020-12-17 14:55:57 +0100
committerJoerg Bornemann <joerg.bornemann@qt.io>2021-01-07 15:32:28 +0100
commitad2da2d27a590333fc89a56fc58700a09c3017b3 (patch)
tree7d916e7a15150d1ba3ca4af7f167e33f9d3c6cc6 /tests/auto/corelib/plugin
parentfca3ea040c9d05f112c6fc018f0c8e8c68892642 (diff)
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 <edward.welbourne@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Kai Koehne <kai.koehne@qt.io>
Diffstat (limited to 'tests/auto/corelib/plugin')
-rw-r--r--tests/auto/corelib/plugin/plugin.pro24
-rw-r--r--tests/auto/corelib/plugin/qfactoryloader/plugin1/plugin1.pro13
-rw-r--r--tests/auto/corelib/plugin/qfactoryloader/plugin2/plugin2.pro13
-rw-r--r--tests/auto/corelib/plugin/qfactoryloader/qfactoryloader.pro15
-rw-r--r--tests/auto/corelib/plugin/qfactoryloader/test/test.pro30
-rw-r--r--tests/auto/corelib/plugin/qlibrary/lib/lib.pro21
-rw-r--r--tests/auto/corelib/plugin/qlibrary/lib2/lib2.pro53
-rw-r--r--tests/auto/corelib/plugin/qlibrary/qlibrary.pro15
-rw-r--r--tests/auto/corelib/plugin/qlibrary/tst/tst.pro25
-rw-r--r--tests/auto/corelib/plugin/qplugin/debugplugin/debugplugin.pro6
-rw-r--r--tests/auto/corelib/plugin/qplugin/invalidplugin/invalidplugin.pro5
-rw-r--r--tests/auto/corelib/plugin/qplugin/qplugin.pro17
-rw-r--r--tests/auto/corelib/plugin/qplugin/releaseplugin/releaseplugin.pro6
-rw-r--r--tests/auto/corelib/plugin/qplugin/tst_qplugin.pro6
-rw-r--r--tests/auto/corelib/plugin/qpluginloader/almostplugin/almostplugin.pro12
-rw-r--r--tests/auto/corelib/plugin/qpluginloader/lib/lib.pro13
-rw-r--r--tests/auto/corelib/plugin/qpluginloader/machtest/machtest.pri13
-rw-r--r--tests/auto/corelib/plugin/qpluginloader/machtest/machtest.pro15
-rw-r--r--tests/auto/corelib/plugin/qpluginloader/machtest/machtest_fat.pro47
-rw-r--r--tests/auto/corelib/plugin/qpluginloader/machtest/machtest_i386.pro3
-rw-r--r--tests/auto/corelib/plugin/qpluginloader/machtest/machtest_ppc64.pro9
-rw-r--r--tests/auto/corelib/plugin/qpluginloader/machtest/machtest_x86_64.pro2
-rw-r--r--tests/auto/corelib/plugin/qpluginloader/qpluginloader.pro21
-rw-r--r--tests/auto/corelib/plugin/qpluginloader/staticplugin/staticplugin.pro7
-rw-r--r--tests/auto/corelib/plugin/qpluginloader/theplugin/theplugin.pro13
-rw-r--r--tests/auto/corelib/plugin/qpluginloader/tst/tst.pro21
-rw-r--r--tests/auto/corelib/plugin/quuid/quuid.pro6
-rw-r--r--tests/auto/corelib/plugin/quuid/test/test.pro19
-rw-r--r--tests/auto/corelib/plugin/quuid/testProcessUniqueness/testProcessUniqueness.pro9
29 files changed, 0 insertions, 459 deletions
diff --git a/tests/auto/corelib/plugin/plugin.pro b/tests/auto/corelib/plugin/plugin.pro
deleted file mode 100644
index c153fa37d9..0000000000
--- a/tests/auto/corelib/plugin/plugin.pro
+++ /dev/null
@@ -1,24 +0,0 @@
-TEMPLATE=subdirs
-SUBDIRS=\
- qfactoryloader \
- quuid
-
-qtConfig(library): SUBDIRS += \
- qpluginloader \
- qplugin \
- qlibrary
-
-contains(CONFIG, static) {
- message(Disabling tests requiring shared build of Qt)
- SUBDIRS -= qfactoryloader \
- qplugin
-}
-
-# QTBUG-87438
-android {
- SUBDIRS -= \
- qpluginloader \
- qplugin \
- qlibrary \
- qfactoryloader
-}
diff --git a/tests/auto/corelib/plugin/qfactoryloader/plugin1/plugin1.pro b/tests/auto/corelib/plugin/qfactoryloader/plugin1/plugin1.pro
deleted file mode 100644
index 964e466228..0000000000
--- a/tests/auto/corelib/plugin/qfactoryloader/plugin1/plugin1.pro
+++ /dev/null
@@ -1,13 +0,0 @@
-TEMPLATE = lib
-QT = core
-CONFIG += plugin
-HEADERS = plugin1.h
-SOURCES = plugin1.cpp
-TARGET = $$qtLibraryTarget(plugin1)
-DESTDIR = ../bin
-
-!qtConfig(library): DEFINES += QT_STATICPLUGIN
-
-# This is testdata for the tst_qpluginloader test.
-target.path = $$[QT_INSTALL_TESTS]/tst_qfactoryloader/bin
-INSTALLS += target
diff --git a/tests/auto/corelib/plugin/qfactoryloader/plugin2/plugin2.pro b/tests/auto/corelib/plugin/qfactoryloader/plugin2/plugin2.pro
deleted file mode 100644
index cc888f1d10..0000000000
--- a/tests/auto/corelib/plugin/qfactoryloader/plugin2/plugin2.pro
+++ /dev/null
@@ -1,13 +0,0 @@
-TEMPLATE = lib
-QT = core
-CONFIG += plugin
-HEADERS = plugin2.h
-SOURCES = plugin2.cpp
-TARGET = $$qtLibraryTarget(plugin2)
-DESTDIR = ../bin
-
-!qtConfig(library): DEFINES += QT_STATICPLUGIN
-
-# This is testdata for the tst_qpluginloader test.
-target.path = $$[QT_INSTALL_TESTS]/tst_qfactoryloader/bin
-INSTALLS += target
diff --git a/tests/auto/corelib/plugin/qfactoryloader/qfactoryloader.pro b/tests/auto/corelib/plugin/qfactoryloader/qfactoryloader.pro
deleted file mode 100644
index f0430d55e6..0000000000
--- a/tests/auto/corelib/plugin/qfactoryloader/qfactoryloader.pro
+++ /dev/null
@@ -1,15 +0,0 @@
-QT = core-private
-TEMPLATE = subdirs
-
-test.depends = plugin1 plugin2
-SUBDIRS = \
- plugin1 \
- plugin2 \
- test
-
-TARGET = tst_qpluginloader
-
-# no special install rule for subdir
-INSTALLS =
-
-
diff --git a/tests/auto/corelib/plugin/qfactoryloader/test/test.pro b/tests/auto/corelib/plugin/qfactoryloader/test/test.pro
deleted file mode 100644
index 5e4d65a49f..0000000000
--- a/tests/auto/corelib/plugin/qfactoryloader/test/test.pro
+++ /dev/null
@@ -1,30 +0,0 @@
-CONFIG += testcase
-TARGET = ../tst_qfactoryloader
-QT = core-private testlib
-
-SOURCES = \
- ../tst_qfactoryloader.cpp
-
-HEADERS = \
- ../plugin1/plugininterface1.h \
- ../plugin2/plugininterface2.h
-
-win32 {
- CONFIG(debug, debug|release) {
- TARGET = ../../debug/tst_qfactoryloader
- } else {
- TARGET = ../../release/tst_qfactoryloader
- }
-}
-
-!qtConfig(library) {
- LIBS += -L ../bin/ -lplugin1 -lplugin2
-}
-
-android {
- libs.prefix = android_test_data
- libs.base = $$OUT_PWD/..
- libs.files += $$OUT_PWD/../bin
-
- RESOURCES += libs
-}
diff --git a/tests/auto/corelib/plugin/qlibrary/lib/lib.pro b/tests/auto/corelib/plugin/qlibrary/lib/lib.pro
deleted file mode 100644
index 2c3305e872..0000000000
--- a/tests/auto/corelib/plugin/qlibrary/lib/lib.pro
+++ /dev/null
@@ -1,21 +0,0 @@
-TEMPLATE = lib
-CONFIG += dll
-CONFIG -= staticlib
-SOURCES = mylib.c
-TARGET = mylib
-DESTDIR = ../
-QT = core
-
-msvc: DEFINES += WIN32_MSVC
-
-# This project is testdata for tst_qlibrary
-target.path = $$[QT_INSTALL_TESTS]/tst_qlibrary
-INSTALLS += target
-
-win32:debug_and_release {
- CONFIG(debug, debug|release) {
- DESTDIR = ../debug/
- } else {
- DESTDIR = ../release/
- }
-}
diff --git a/tests/auto/corelib/plugin/qlibrary/lib2/lib2.pro b/tests/auto/corelib/plugin/qlibrary/lib2/lib2.pro
deleted file mode 100644
index 3db4bed973..0000000000
--- a/tests/auto/corelib/plugin/qlibrary/lib2/lib2.pro
+++ /dev/null
@@ -1,53 +0,0 @@
-TEMPLATE = lib
-CONFIG += dll
-CONFIG -= staticlib
-SOURCES = mylib.c
-TARGET = mylib
-DESTDIR = ../
-VERSION = 2
-QT = core
-
-msvc: DEFINES += WIN32_MSVC
-
-# Force a copy of the library to have an extension that is non-standard.
-# We want to test if we can load a shared library with *any* filename...
-
-win32 {
-
- debug_and_release {
- CONFIG(debug, debug|release)) {
- BUILD_FOLDER = debug
- } else {
- BUILD_FOLDER = release
- }
- DESTDIR = ../$$BUILD_FOLDER/
- } else {
- BUILD_FOLDER =
- DESTDIR = ../
- }
-
- # vcproj and Makefile generators refer to target differently
- contains(TEMPLATE,vc.*) {
- src = $(TargetPath)
- } else {
- src = $(DESTDIR_TARGET)
- }
- files = $$BUILD_FOLDER$${QMAKE_DIR_SEP}mylib.dl2 $$BUILD_FOLDER$${QMAKE_DIR_SEP}system.qt.test.mylib.dll
-} else {
- src = $(DESTDIR)$(TARGET)
- files = libmylib.so2 system.qt.test.mylib.so
-}
-
-# This project is testdata for tst_qlibrary
-target.path = $$[QT_INSTALL_TESTS]$${QMAKE_DIR_SEP}tst_qlibrary
-renamed_target.path = $$target.path
-
-for(file, files) {
- QMAKE_POST_LINK += $$QMAKE_COPY $$src ..$$QMAKE_DIR_SEP$$file &&
- renamed_target.extra += $$QMAKE_COPY $$src $(INSTALL_ROOT)$${target.path}$$QMAKE_DIR_SEP$$file &&
- CLEAN_FILES += ..$$QMAKE_DIR_SEP$$file
-}
-renamed_target.extra = $$member(renamed_target.extra, 0, -2)
-QMAKE_POST_LINK = $$member(QMAKE_POST_LINK, 0, -2)
-
-INSTALLS += target renamed_target
diff --git a/tests/auto/corelib/plugin/qlibrary/qlibrary.pro b/tests/auto/corelib/plugin/qlibrary/qlibrary.pro
deleted file mode 100644
index ec230601c4..0000000000
--- a/tests/auto/corelib/plugin/qlibrary/qlibrary.pro
+++ /dev/null
@@ -1,15 +0,0 @@
-QT = core
-TEMPLATE = subdirs
-
-tst.depends = lib lib2
-# lib2 has to be installed after lib, so that plain libmylib.so symlink points
-# to version 2 as expected by the test
-lib2.depends = lib
-
-SUBDIRS = lib \
- lib2 \
- tst
-TARGET = tst_qlibrary
-
-# no special install rule for subdir
-INSTALLS =
diff --git a/tests/auto/corelib/plugin/qlibrary/tst/tst.pro b/tests/auto/corelib/plugin/qlibrary/tst/tst.pro
deleted file mode 100644
index 5894bee9d5..0000000000
--- a/tests/auto/corelib/plugin/qlibrary/tst/tst.pro
+++ /dev/null
@@ -1,25 +0,0 @@
-CONFIG += testcase
-TARGET = ../tst_qlibrary
-QT = core testlib
-SOURCES = ../tst_qlibrary.cpp
-
-win32:debug_and_release {
- CONFIG(debug, debug|release) {
- TARGET = ../../debug/tst_qlibrary
- } else {
- TARGET = ../../release/tst_qlibrary
- }
-}
-
-TESTDATA += ../library_path/invalid.so
-
-android {
- libs.prefix = android_test_data
- libs.base = $$OUT_PWD/..
- libs.files += $$OUT_PWD/../libmylib.so \
- $$OUT_PWD/../libmylib.so2 \
- $$OUT_PWD/../libmylib.prl \
- $$OUT_PWD/../system.qt.test.mylib.so
-
- RESOURCES += libs
-}
diff --git a/tests/auto/corelib/plugin/qplugin/debugplugin/debugplugin.pro b/tests/auto/corelib/plugin/qplugin/debugplugin/debugplugin.pro
deleted file mode 100644
index ca47df22bd..0000000000
--- a/tests/auto/corelib/plugin/qplugin/debugplugin/debugplugin.pro
+++ /dev/null
@@ -1,6 +0,0 @@
-TEMPLATE = lib
-CONFIG += plugin debug
-CONFIG -= release debug_and_release
-SOURCES = main.cpp
-QT = core
-DESTDIR = ../plugins
diff --git a/tests/auto/corelib/plugin/qplugin/invalidplugin/invalidplugin.pro b/tests/auto/corelib/plugin/qplugin/invalidplugin/invalidplugin.pro
deleted file mode 100644
index d953c6d367..0000000000
--- a/tests/auto/corelib/plugin/qplugin/invalidplugin/invalidplugin.pro
+++ /dev/null
@@ -1,5 +0,0 @@
-QT = core
-TEMPLATE = lib
-CONFIG += plugin
-SOURCES = main.cpp
-DESTDIR = ../plugins
diff --git a/tests/auto/corelib/plugin/qplugin/qplugin.pro b/tests/auto/corelib/plugin/qplugin/qplugin.pro
deleted file mode 100644
index 96fc704c07..0000000000
--- a/tests/auto/corelib/plugin/qplugin/qplugin.pro
+++ /dev/null
@@ -1,17 +0,0 @@
-TEMPLATE = subdirs
-TESTPLUGINS = invalidplugin
-
-win32 {
- contains(QT_CONFIG, debug): TESTPLUGINS += debugplugin
- contains(QT_CONFIG, release): TESTPLUGINS += releaseplugin
-} else:osx {
- CONFIG(debug, debug|release): TESTPLUGINS += debugplugin
- CONFIG(release, debug|release): TESTPLUGINS += releaseplugin
-} else {
- TESTPLUGINS += debugplugin releaseplugin
-}
-
-SUBDIRS += main $$TESTPLUGINS
-main.file = tst_qplugin.pro
-main.depends = $$TESTPLUGINS
-
diff --git a/tests/auto/corelib/plugin/qplugin/releaseplugin/releaseplugin.pro b/tests/auto/corelib/plugin/qplugin/releaseplugin/releaseplugin.pro
deleted file mode 100644
index b7dea67894..0000000000
--- a/tests/auto/corelib/plugin/qplugin/releaseplugin/releaseplugin.pro
+++ /dev/null
@@ -1,6 +0,0 @@
-TEMPLATE = lib
-CONFIG += plugin release
-CONFIG -= debug debug_and_release
-SOURCES = main.cpp
-QT = core
-DESTDIR = ../plugins
diff --git a/tests/auto/corelib/plugin/qplugin/tst_qplugin.pro b/tests/auto/corelib/plugin/qplugin/tst_qplugin.pro
deleted file mode 100644
index 4432ee20c1..0000000000
--- a/tests/auto/corelib/plugin/qplugin/tst_qplugin.pro
+++ /dev/null
@@ -1,6 +0,0 @@
-CONFIG += testcase
-TARGET = tst_qplugin
-QT = core-private testlib
-SOURCES = tst_qplugin.cpp
-
-TESTDATA += plugins/*
diff --git a/tests/auto/corelib/plugin/qpluginloader/almostplugin/almostplugin.pro b/tests/auto/corelib/plugin/qpluginloader/almostplugin/almostplugin.pro
deleted file mode 100644
index abfc70883e..0000000000
--- a/tests/auto/corelib/plugin/qpluginloader/almostplugin/almostplugin.pro
+++ /dev/null
@@ -1,12 +0,0 @@
-TEMPLATE = lib
-CONFIG += plugin
-HEADERS = almostplugin.h
-SOURCES = almostplugin.cpp
-TARGET = almostplugin
-DESTDIR = ../bin
-QT = core
-*-g++*:QMAKE_LFLAGS -= -Wl,--no-undefined
-
-# This is testdata for the tst_qpluginloader test.
-target.path = $$[QT_INSTALL_TESTS]/tst_qpluginloader/bin
-INSTALLS += target
diff --git a/tests/auto/corelib/plugin/qpluginloader/lib/lib.pro b/tests/auto/corelib/plugin/qpluginloader/lib/lib.pro
deleted file mode 100644
index aa72a80559..0000000000
--- a/tests/auto/corelib/plugin/qpluginloader/lib/lib.pro
+++ /dev/null
@@ -1,13 +0,0 @@
-TEMPLATE = lib
-CONFIG += dll
-CONFIG -= staticlib
-SOURCES = mylib.c
-TARGET = tst_qpluginloaderlib
-DESTDIR = ../bin
-QT = core
-
-msvc: DEFINES += WIN32_MSVC
-
-# This is testdata for the tst_qpluginloader test.
-target.path = $$[QT_INSTALL_TESTS]/tst_qpluginloader/bin
-INSTALLS += target
diff --git a/tests/auto/corelib/plugin/qpluginloader/machtest/machtest.pri b/tests/auto/corelib/plugin/qpluginloader/machtest/machtest.pri
deleted file mode 100644
index ca4a0a07e9..0000000000
--- a/tests/auto/corelib/plugin/qpluginloader/machtest/machtest.pri
+++ /dev/null
@@ -1,13 +0,0 @@
-TEMPLATE = aux
-
-# Needs explicit load()ing due to aux template. Relies on QT being non-empty.
-load(qt)
-
-goodlib.target = good.$${QMAKE_APPLE_DEVICE_ARCHS}.dylib
-goodlib.commands = $(CXX) $(CXXFLAGS) -shared -o $@ -I$(INCPATH) $<
-goodlib.depends += $$PWD/../fakeplugin.cpp
-
-all.depends += goodlib
-
-QMAKE_EXTRA_TARGETS += goodlib all
-QMAKE_CLEAN += $$goodlib.target
diff --git a/tests/auto/corelib/plugin/qpluginloader/machtest/machtest.pro b/tests/auto/corelib/plugin/qpluginloader/machtest/machtest.pro
deleted file mode 100644
index 795dd89895..0000000000
--- a/tests/auto/corelib/plugin/qpluginloader/machtest/machtest.pro
+++ /dev/null
@@ -1,15 +0,0 @@
-TEMPLATE = subdirs
-
-SUBDIRS = \
- machtest_i386.pro \
- machtest_x86_64.pro \
- machtest_ppc64.pro \
- machtest_fat.pro
-
-machtest_fat-pro.depends = \
- machtest_i386.pro \
- machtest_x86_64.pro \
- machtest_ppc64.pro
-
-machtest_ppc64-pro.depends = \
- machtest_x86_64.pro
diff --git a/tests/auto/corelib/plugin/qpluginloader/machtest/machtest_fat.pro b/tests/auto/corelib/plugin/qpluginloader/machtest/machtest_fat.pro
deleted file mode 100644
index 9c34a873bc..0000000000
--- a/tests/auto/corelib/plugin/qpluginloader/machtest/machtest_fat.pro
+++ /dev/null
@@ -1,47 +0,0 @@
-TEMPLATE = aux
-OTHER_FILES += generate-bad.pl
-
-# Needs explicit load()ing due to aux template. Relies on QT being non-empty.
-load(qt)
-
-# Generate a fat binary with three architectures
-fat_all.target = good.fat.all.dylib
-fat_all.commands = lipo -create -output $@ \
- -arch ppc64 good.ppc64.dylib \
- -arch i386 good.i386.dylib \
- -arch x86_64 good.x86_64.dylib
-fat_all.depends += good.i386.dylib good.x86_64.dylib good.ppc64.dylib
-
-fat_no_i386.target = good.fat.no-i386.dylib
-fat_no_i386.commands = lipo -create -output $@ -arch x86_64 good.x86_64.dylib -arch ppc64 good.ppc64.dylib
-fat_no_i386.depends += good.x86_64.dylib good.ppc64.dylib
-
-fat_no_x86_64.target = good.fat.no-x86_64.dylib
-fat_no_x86_64.commands = lipo -create -output $@ -arch i386 good.i386.dylib -arch ppc64 good.ppc64.dylib
-fat_no_x86_64.depends += good.i386.dylib good.ppc64.dylib
-
-stub_i386.commands = $$QMAKE_CXX -shared -arch i386 -o stub.i386.dylib $$PWD/stub.cpp
-stub_i386.depends += $$PWD/stub.cpp
-
-stub_x86_64.commands = $$QMAKE_CXX -shared -arch x86_64 -o stub.x86_64.dylib $$PWD/stub.cpp
-stub_x86_64.depends += $$PWD/stub.cpp
-
-fat_stub_i386.target = good.fat.stub-i386.dylib
-fat_stub_i386.commands = lipo -create -output $@ -arch ppc64 good.ppc64.dylib -arch i386 stub.i386.dylib
-fat_stub_i386.depends += stub_i386 good.x86_64.dylib good.ppc64.dylib
-
-fat_stub_x86_64.target = good.fat.stub-x86_64.dylib
-fat_stub_x86_64.commands = lipo -create -output $@ -arch ppc64 good.ppc64.dylib -arch x86_64 stub.x86_64.dylib
-fat_stub_x86_64.depends += stub_x86_64 good.i386.dylib good.ppc64.dylib
-
-bad.commands = $$PWD/generate-bad.pl
-bad.depends += $$PWD/generate-bad.pl
-
-MYTARGETS = $$fat_all.depends fat_all fat_no_x86_64 fat_no_i386 \
- fat_stub_i386 fat_stub_x86_64 bad stub_i386 stub_x86_64
-all.depends += $$MYTARGETS
-QMAKE_EXTRA_TARGETS += $$MYTARGETS all
-
-QMAKE_CLEAN += $$fat_all.target $$fat_no_i386.target $$fat_no_x86_64.target \
- $$fat_stub_i386.target $$fat_stub_x86_64.target \
- "bad*.dylib"
diff --git a/tests/auto/corelib/plugin/qpluginloader/machtest/machtest_i386.pro b/tests/auto/corelib/plugin/qpluginloader/machtest/machtest_i386.pro
deleted file mode 100644
index bfb2e0930c..0000000000
--- a/tests/auto/corelib/plugin/qpluginloader/machtest/machtest_i386.pro
+++ /dev/null
@@ -1,3 +0,0 @@
-QMAKE_APPLE_DEVICE_ARCHS = i386
-include(machtest.pri)
-
diff --git a/tests/auto/corelib/plugin/qpluginloader/machtest/machtest_ppc64.pro b/tests/auto/corelib/plugin/qpluginloader/machtest/machtest_ppc64.pro
deleted file mode 100644
index a73f97ccc6..0000000000
--- a/tests/auto/corelib/plugin/qpluginloader/machtest/machtest_ppc64.pro
+++ /dev/null
@@ -1,9 +0,0 @@
-QMAKE_APPLE_DEVICE_ARCHS = ppc64
-include(machtest.pri)
-
-OTHER_FILES += ppcconverter.pl
-
-# Current macOS toolchains have no compiler for PPC anymore
-# So we fake it by converting an x86-64 binary to (little-endian!) PPC64
-goodlib.commands = $$PWD/ppcconverter.pl $< $@
-goodlib.depends = good.x86_64.dylib $$PWD/ppcconverter.pl
diff --git a/tests/auto/corelib/plugin/qpluginloader/machtest/machtest_x86_64.pro b/tests/auto/corelib/plugin/qpluginloader/machtest/machtest_x86_64.pro
deleted file mode 100644
index 9dbae5c4ee..0000000000
--- a/tests/auto/corelib/plugin/qpluginloader/machtest/machtest_x86_64.pro
+++ /dev/null
@@ -1,2 +0,0 @@
-QMAKE_APPLE_DEVICE_ARCHS = x86_64
-include(machtest.pri)
diff --git a/tests/auto/corelib/plugin/qpluginloader/qpluginloader.pro b/tests/auto/corelib/plugin/qpluginloader/qpluginloader.pro
deleted file mode 100644
index 18c9c8d198..0000000000
--- a/tests/auto/corelib/plugin/qpluginloader/qpluginloader.pro
+++ /dev/null
@@ -1,21 +0,0 @@
-QT = core
-TEMPLATE = subdirs
-
-tst.depends = lib theplugin
-SUBDIRS = lib \
- staticplugin \
- theplugin \
- tst
-!android:!win32:!darwin {
- tst.depends += almostplugin
- SUBDIRS += almostplugin
-}
-macos:qtConfig(private_tests):qtHaveModule(gui) {
- tst.depends += machtest
- SUBDIRS += machtest
-}
-
-# no special install rule for subdir
-INSTALLS =
-
-
diff --git a/tests/auto/corelib/plugin/qpluginloader/staticplugin/staticplugin.pro b/tests/auto/corelib/plugin/qpluginloader/staticplugin/staticplugin.pro
deleted file mode 100644
index ff65ab728c..0000000000
--- a/tests/auto/corelib/plugin/qpluginloader/staticplugin/staticplugin.pro
+++ /dev/null
@@ -1,7 +0,0 @@
-TEMPLATE = lib
-CONFIG += plugin static
-SOURCES = main.cpp
-QT = core
-
-# Add extra metadata to the plugin
-QMAKE_MOC_OPTIONS += -M ExtraMetaData=StaticPlugin -M ExtraMetaData=foo
diff --git a/tests/auto/corelib/plugin/qpluginloader/theplugin/theplugin.pro b/tests/auto/corelib/plugin/qpluginloader/theplugin/theplugin.pro
deleted file mode 100644
index 6ec4a8de05..0000000000
--- a/tests/auto/corelib/plugin/qpluginloader/theplugin/theplugin.pro
+++ /dev/null
@@ -1,13 +0,0 @@
-TEMPLATE = lib
-CONFIG += plugin
-HEADERS = theplugin.h
-SOURCES = theplugin.cpp
-# Use a predictable name for the plugin, no debug extension. Just like most apps do.
-#TARGET = $$qtLibraryTarget(theplugin)
-TARGET = theplugin
-DESTDIR = ../bin
-QT = core
-
-# This is testdata for the tst_qpluginloader test.
-target.path = $$[QT_INSTALL_TESTS]/tst_qpluginloader/bin
-INSTALLS += target
diff --git a/tests/auto/corelib/plugin/qpluginloader/tst/tst.pro b/tests/auto/corelib/plugin/qpluginloader/tst/tst.pro
deleted file mode 100644
index d49bff14fd..0000000000
--- a/tests/auto/corelib/plugin/qpluginloader/tst/tst.pro
+++ /dev/null
@@ -1,21 +0,0 @@
-CONFIG += testcase
-TARGET = ../tst_qpluginloader
-QT = core testlib
-qtConfig(private_tests): QT += core-private
-SOURCES = ../tst_qpluginloader.cpp ../fakeplugin.cpp
-HEADERS = ../theplugin/plugininterface.h
-
-win32:debug_and_release {
- CONFIG(debug, debug|release) {
- TARGET = ../../debug/tst_qpluginloader
- LIBS += -L../staticplugin/debug
- } else {
- TARGET = ../../release/tst_qpluginloader
- LIBS += -L../staticplugin/release
- }
-} else {
- LIBS += -L../staticplugin
-}
-LIBS += -lstaticplugin
-
-TESTDATA += ../elftest ../machtest
diff --git a/tests/auto/corelib/plugin/quuid/quuid.pro b/tests/auto/corelib/plugin/quuid/quuid.pro
deleted file mode 100644
index 25e24561ae..0000000000
--- a/tests/auto/corelib/plugin/quuid/quuid.pro
+++ /dev/null
@@ -1,6 +0,0 @@
-TEMPLATE = subdirs
-
-SUBDIRS = testProcessUniqueness
-
-SUBDIRS += test
-
diff --git a/tests/auto/corelib/plugin/quuid/test/test.pro b/tests/auto/corelib/plugin/quuid/test/test.pro
deleted file mode 100644
index 562bfbdc25..0000000000
--- a/tests/auto/corelib/plugin/quuid/test/test.pro
+++ /dev/null
@@ -1,19 +0,0 @@
-CONFIG += testcase
-TARGET = tst_quuid
-QT = core testlib
-SOURCES = ../tst_quuid.cpp
-
-darwin {
- OBJECTIVE_SOURCES = ../tst_quuid_darwin.mm
- LIBS += -framework Foundation
-}
-
-CONFIG(debug_and_release_target) {
- CONFIG(debug, debug|release) {
- DESTDIR = ../debug
- } else {
- DESTDIR = ../release
- }
-} else {
- DESTDIR = ..
-}
diff --git a/tests/auto/corelib/plugin/quuid/testProcessUniqueness/testProcessUniqueness.pro b/tests/auto/corelib/plugin/quuid/testProcessUniqueness/testProcessUniqueness.pro
deleted file mode 100644
index 5ee7b1a21f..0000000000
--- a/tests/auto/corelib/plugin/quuid/testProcessUniqueness/testProcessUniqueness.pro
+++ /dev/null
@@ -1,9 +0,0 @@
-SOURCES = main.cpp
-QT = core
-CONFIG += console
-
-DESTDIR = ./
-
-# This app is testdata for tst_quuid
-target.path = $$[QT_INSTALL_TESTS]/tst_quuid/$$TARGET
-INSTALLS += target