diff options
author | Joerg Bornemann <joerg.bornemann@qt.io> | 2020-12-17 14:55:57 +0100 |
---|---|---|
committer | Joerg Bornemann <joerg.bornemann@qt.io> | 2021-01-07 15:32:28 +0100 |
commit | ad2da2d27a590333fc89a56fc58700a09c3017b3 (patch) | |
tree | 7d916e7a15150d1ba3ca4af7f167e33f9d3c6cc6 /tests/auto/corelib/plugin/qlibrary | |
parent | fca3ea040c9d05f112c6fc018f0c8e8c68892642 (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/qlibrary')
-rw-r--r-- | tests/auto/corelib/plugin/qlibrary/lib/lib.pro | 21 | ||||
-rw-r--r-- | tests/auto/corelib/plugin/qlibrary/lib2/lib2.pro | 53 | ||||
-rw-r--r-- | tests/auto/corelib/plugin/qlibrary/qlibrary.pro | 15 | ||||
-rw-r--r-- | tests/auto/corelib/plugin/qlibrary/tst/tst.pro | 25 |
4 files changed, 0 insertions, 114 deletions
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 -} |