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/thread | |
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/thread')
39 files changed, 0 insertions, 202 deletions
diff --git a/tests/auto/corelib/thread/qatomicint/qatomicint.pro b/tests/auto/corelib/thread/qatomicint/qatomicint.pro deleted file mode 100644 index 89ac465e81..0000000000 --- a/tests/auto/corelib/thread/qatomicint/qatomicint.pro +++ /dev/null @@ -1,4 +0,0 @@ -CONFIG += testcase -TARGET = tst_qatomicint -QT = core testlib -SOURCES = tst_qatomicint.cpp diff --git a/tests/auto/corelib/thread/qatomicinteger/char/char.pro b/tests/auto/corelib/thread/qatomicinteger/char/char.pro deleted file mode 100644 index 1e97d5cbae..0000000000 --- a/tests/auto/corelib/thread/qatomicinteger/char/char.pro +++ /dev/null @@ -1 +0,0 @@ -include(../qatomicinteger.pri) diff --git a/tests/auto/corelib/thread/qatomicinteger/char16_t/char16_t.pro b/tests/auto/corelib/thread/qatomicinteger/char16_t/char16_t.pro deleted file mode 100644 index 1e97d5cbae..0000000000 --- a/tests/auto/corelib/thread/qatomicinteger/char16_t/char16_t.pro +++ /dev/null @@ -1 +0,0 @@ -include(../qatomicinteger.pri) diff --git a/tests/auto/corelib/thread/qatomicinteger/char32_t/char32_t.pro b/tests/auto/corelib/thread/qatomicinteger/char32_t/char32_t.pro deleted file mode 100644 index 1e97d5cbae..0000000000 --- a/tests/auto/corelib/thread/qatomicinteger/char32_t/char32_t.pro +++ /dev/null @@ -1 +0,0 @@ -include(../qatomicinteger.pri) diff --git a/tests/auto/corelib/thread/qatomicinteger/int/int.pro b/tests/auto/corelib/thread/qatomicinteger/int/int.pro deleted file mode 100644 index 1e97d5cbae..0000000000 --- a/tests/auto/corelib/thread/qatomicinteger/int/int.pro +++ /dev/null @@ -1 +0,0 @@ -include(../qatomicinteger.pri) diff --git a/tests/auto/corelib/thread/qatomicinteger/long/long.pro b/tests/auto/corelib/thread/qatomicinteger/long/long.pro deleted file mode 100644 index 1e97d5cbae..0000000000 --- a/tests/auto/corelib/thread/qatomicinteger/long/long.pro +++ /dev/null @@ -1 +0,0 @@ -include(../qatomicinteger.pri) diff --git a/tests/auto/corelib/thread/qatomicinteger/qatomicinteger.pri b/tests/auto/corelib/thread/qatomicinteger/qatomicinteger.pri deleted file mode 100644 index f1030d41ef..0000000000 --- a/tests/auto/corelib/thread/qatomicinteger/qatomicinteger.pri +++ /dev/null @@ -1,11 +0,0 @@ -# Get our build type from the directory name -TYPE = $$basename(_PRO_FILE_PWD_) -dn = $$dirname(_PRO_FILE_PWD_) -FORCE = $$basename(dn) -suffix = $$TYPE - -CONFIG += testcase -QT = core testlib -TARGET = tst_qatomicinteger_$$lower($$suffix) -SOURCES = $$PWD/tst_qatomicinteger.cpp -DEFINES += QATOMIC_TEST_TYPE=$$TYPE tst_QAtomicIntegerXX=tst_QAtomicInteger_$$suffix diff --git a/tests/auto/corelib/thread/qatomicinteger/qatomicinteger.pro b/tests/auto/corelib/thread/qatomicinteger/qatomicinteger.pro deleted file mode 100644 index 09458bd9c3..0000000000 --- a/tests/auto/corelib/thread/qatomicinteger/qatomicinteger.pro +++ /dev/null @@ -1,18 +0,0 @@ -TEMPLATE=subdirs -SUBDIRS=\ - char \ - char16_t \ - char32_t \ - int \ - long \ - qlonglong \ - qptrdiff \ - quintptr \ - qulonglong \ - schar \ - short \ - uchar \ - uint \ - ulong \ - ushort \ - wchar_t \ diff --git a/tests/auto/corelib/thread/qatomicinteger/qlonglong/qlonglong.pro b/tests/auto/corelib/thread/qatomicinteger/qlonglong/qlonglong.pro deleted file mode 100644 index 1e97d5cbae..0000000000 --- a/tests/auto/corelib/thread/qatomicinteger/qlonglong/qlonglong.pro +++ /dev/null @@ -1 +0,0 @@ -include(../qatomicinteger.pri) diff --git a/tests/auto/corelib/thread/qatomicinteger/qptrdiff/qptrdiff.pro b/tests/auto/corelib/thread/qatomicinteger/qptrdiff/qptrdiff.pro deleted file mode 100644 index 1e97d5cbae..0000000000 --- a/tests/auto/corelib/thread/qatomicinteger/qptrdiff/qptrdiff.pro +++ /dev/null @@ -1 +0,0 @@ -include(../qatomicinteger.pri) diff --git a/tests/auto/corelib/thread/qatomicinteger/quintptr/quintptr.pro b/tests/auto/corelib/thread/qatomicinteger/quintptr/quintptr.pro deleted file mode 100644 index 1e97d5cbae..0000000000 --- a/tests/auto/corelib/thread/qatomicinteger/quintptr/quintptr.pro +++ /dev/null @@ -1 +0,0 @@ -include(../qatomicinteger.pri) diff --git a/tests/auto/corelib/thread/qatomicinteger/qulonglong/qulonglong.pro b/tests/auto/corelib/thread/qatomicinteger/qulonglong/qulonglong.pro deleted file mode 100644 index 1e97d5cbae..0000000000 --- a/tests/auto/corelib/thread/qatomicinteger/qulonglong/qulonglong.pro +++ /dev/null @@ -1 +0,0 @@ -include(../qatomicinteger.pri) diff --git a/tests/auto/corelib/thread/qatomicinteger/schar/schar.pro b/tests/auto/corelib/thread/qatomicinteger/schar/schar.pro deleted file mode 100644 index 1e97d5cbae..0000000000 --- a/tests/auto/corelib/thread/qatomicinteger/schar/schar.pro +++ /dev/null @@ -1 +0,0 @@ -include(../qatomicinteger.pri) diff --git a/tests/auto/corelib/thread/qatomicinteger/short/short.pro b/tests/auto/corelib/thread/qatomicinteger/short/short.pro deleted file mode 100644 index 1e97d5cbae..0000000000 --- a/tests/auto/corelib/thread/qatomicinteger/short/short.pro +++ /dev/null @@ -1 +0,0 @@ -include(../qatomicinteger.pri) diff --git a/tests/auto/corelib/thread/qatomicinteger/uchar/uchar.pro b/tests/auto/corelib/thread/qatomicinteger/uchar/uchar.pro deleted file mode 100644 index 1e97d5cbae..0000000000 --- a/tests/auto/corelib/thread/qatomicinteger/uchar/uchar.pro +++ /dev/null @@ -1 +0,0 @@ -include(../qatomicinteger.pri) diff --git a/tests/auto/corelib/thread/qatomicinteger/uint/uint.pro b/tests/auto/corelib/thread/qatomicinteger/uint/uint.pro deleted file mode 100644 index 1e97d5cbae..0000000000 --- a/tests/auto/corelib/thread/qatomicinteger/uint/uint.pro +++ /dev/null @@ -1 +0,0 @@ -include(../qatomicinteger.pri) diff --git a/tests/auto/corelib/thread/qatomicinteger/ulong/ulong.pro b/tests/auto/corelib/thread/qatomicinteger/ulong/ulong.pro deleted file mode 100644 index 1e97d5cbae..0000000000 --- a/tests/auto/corelib/thread/qatomicinteger/ulong/ulong.pro +++ /dev/null @@ -1 +0,0 @@ -include(../qatomicinteger.pri) diff --git a/tests/auto/corelib/thread/qatomicinteger/ushort/ushort.pro b/tests/auto/corelib/thread/qatomicinteger/ushort/ushort.pro deleted file mode 100644 index 1e97d5cbae..0000000000 --- a/tests/auto/corelib/thread/qatomicinteger/ushort/ushort.pro +++ /dev/null @@ -1 +0,0 @@ -include(../qatomicinteger.pri) diff --git a/tests/auto/corelib/thread/qatomicinteger/wchar_t/wchar_t.pro b/tests/auto/corelib/thread/qatomicinteger/wchar_t/wchar_t.pro deleted file mode 100644 index 1e97d5cbae..0000000000 --- a/tests/auto/corelib/thread/qatomicinteger/wchar_t/wchar_t.pro +++ /dev/null @@ -1 +0,0 @@ -include(../qatomicinteger.pri) diff --git a/tests/auto/corelib/thread/qatomicpointer/qatomicpointer.pro b/tests/auto/corelib/thread/qatomicpointer/qatomicpointer.pro deleted file mode 100644 index cce822da6e..0000000000 --- a/tests/auto/corelib/thread/qatomicpointer/qatomicpointer.pro +++ /dev/null @@ -1,4 +0,0 @@ -CONFIG += testcase -TARGET = tst_qatomicpointer -QT = core testlib -SOURCES = tst_qatomicpointer.cpp diff --git a/tests/auto/corelib/thread/qfuture/qfuture.pro b/tests/auto/corelib/thread/qfuture/qfuture.pro deleted file mode 100644 index fe097edf20..0000000000 --- a/tests/auto/corelib/thread/qfuture/qfuture.pro +++ /dev/null @@ -1,5 +0,0 @@ -CONFIG += testcase -TARGET = tst_qfuture -QT = core core-private testlib -SOURCES = tst_qfuture.cpp -DEFINES -= QT_NO_JAVA_STYLE_ITERATORS diff --git a/tests/auto/corelib/thread/qfuturesynchronizer/qfuturesynchronizer.pro b/tests/auto/corelib/thread/qfuturesynchronizer/qfuturesynchronizer.pro deleted file mode 100644 index 0d20117ed0..0000000000 --- a/tests/auto/corelib/thread/qfuturesynchronizer/qfuturesynchronizer.pro +++ /dev/null @@ -1,4 +0,0 @@ -CONFIG += testcase -TARGET = tst_qfuturesynchronizer -QT = core testlib -SOURCES = tst_qfuturesynchronizer.cpp diff --git a/tests/auto/corelib/thread/qfuturewatcher/qfuturewatcher.pro b/tests/auto/corelib/thread/qfuturewatcher/qfuturewatcher.pro deleted file mode 100644 index d0e8b4c982..0000000000 --- a/tests/auto/corelib/thread/qfuturewatcher/qfuturewatcher.pro +++ /dev/null @@ -1,4 +0,0 @@ -CONFIG += testcase -TARGET = tst_qfuturewatcher -QT = core core-private testlib concurrent -SOURCES = tst_qfuturewatcher.cpp diff --git a/tests/auto/corelib/thread/qmutex/qmutex.pro b/tests/auto/corelib/thread/qmutex/qmutex.pro deleted file mode 100644 index cb9d364b71..0000000000 --- a/tests/auto/corelib/thread/qmutex/qmutex.pro +++ /dev/null @@ -1,5 +0,0 @@ -CONFIG += testcase -TARGET = tst_qmutex -QT = core testlib -SOURCES = tst_qmutex.cpp -win32:QT += core-private diff --git a/tests/auto/corelib/thread/qmutexlocker/qmutexlocker.pro b/tests/auto/corelib/thread/qmutexlocker/qmutexlocker.pro deleted file mode 100644 index 76ec0471ca..0000000000 --- a/tests/auto/corelib/thread/qmutexlocker/qmutexlocker.pro +++ /dev/null @@ -1,4 +0,0 @@ -CONFIG += testcase -TARGET = tst_qmutexlocker -QT = core testlib -SOURCES = tst_qmutexlocker.cpp diff --git a/tests/auto/corelib/thread/qpromise/qpromise.pro b/tests/auto/corelib/thread/qpromise/qpromise.pro deleted file mode 100644 index 9ea1aaacdf..0000000000 --- a/tests/auto/corelib/thread/qpromise/qpromise.pro +++ /dev/null @@ -1,4 +0,0 @@ -CONFIG += testcase -TARGET = tst_qpromise -QT = core core-private testlib -SOURCES = tst_qpromise.cpp diff --git a/tests/auto/corelib/thread/qreadlocker/qreadlocker.pro b/tests/auto/corelib/thread/qreadlocker/qreadlocker.pro deleted file mode 100644 index ba46786750..0000000000 --- a/tests/auto/corelib/thread/qreadlocker/qreadlocker.pro +++ /dev/null @@ -1,4 +0,0 @@ -CONFIG += testcase -TARGET = tst_qreadlocker -QT = core testlib -SOURCES = tst_qreadlocker.cpp diff --git a/tests/auto/corelib/thread/qreadwritelock/qreadwritelock.pro b/tests/auto/corelib/thread/qreadwritelock/qreadwritelock.pro deleted file mode 100644 index c108c3d8af..0000000000 --- a/tests/auto/corelib/thread/qreadwritelock/qreadwritelock.pro +++ /dev/null @@ -1,4 +0,0 @@ -CONFIG += testcase -TARGET = tst_qreadwritelock -QT = core testlib -SOURCES = tst_qreadwritelock.cpp diff --git a/tests/auto/corelib/thread/qresultstore/qresultstore.pro b/tests/auto/corelib/thread/qresultstore/qresultstore.pro deleted file mode 100644 index 80e79b1c1a..0000000000 --- a/tests/auto/corelib/thread/qresultstore/qresultstore.pro +++ /dev/null @@ -1,4 +0,0 @@ -CONFIG += testcase -TARGET = tst_qresultstore -QT = core-private testlib -SOURCES = tst_qresultstore.cpp diff --git a/tests/auto/corelib/thread/qsemaphore/qsemaphore.pro b/tests/auto/corelib/thread/qsemaphore/qsemaphore.pro deleted file mode 100644 index 5a0f0337e6..0000000000 --- a/tests/auto/corelib/thread/qsemaphore/qsemaphore.pro +++ /dev/null @@ -1,4 +0,0 @@ -CONFIG += testcase -TARGET = tst_qsemaphore -QT = core testlib -SOURCES = tst_qsemaphore.cpp diff --git a/tests/auto/corelib/thread/qthread/qthread.pro b/tests/auto/corelib/thread/qthread/qthread.pro deleted file mode 100644 index 37552f1fca..0000000000 --- a/tests/auto/corelib/thread/qthread/qthread.pro +++ /dev/null @@ -1,9 +0,0 @@ -CONFIG += testcase -TARGET = tst_qthread -QT = core testlib -SOURCES = tst_qthread.cpp -qtConfig(c++14):CONFIG += c++14 -qtConfig(c++1z):CONFIG += c++1z - -INCLUDEPATH += ../../../../shared/ -HEADERS += ../../../../shared/emulationdetector.h diff --git a/tests/auto/corelib/thread/qthreadonce/qthreadonce.pro b/tests/auto/corelib/thread/qthreadonce/qthreadonce.pro deleted file mode 100644 index e8b95a06a7..0000000000 --- a/tests/auto/corelib/thread/qthreadonce/qthreadonce.pro +++ /dev/null @@ -1,12 +0,0 @@ -CONFIG += testcase -TARGET = tst_qthreadonce -QT = core testlib -SOURCES = tst_qthreadonce.cpp - -# Don't use gcc's threadsafe statics -# Note: some versions of gcc generate invalid code with this option... -# Some versions of gcc don't even have it, so disable it -#*-g++*:QMAKE_CXXFLAGS += -fno-threadsafe-statics - -# Temporary: -SOURCES += qthreadonce.cpp diff --git a/tests/auto/corelib/thread/qthreadpool/qthreadpool.pro b/tests/auto/corelib/thread/qthreadpool/qthreadpool.pro deleted file mode 100644 index eac4ef9365..0000000000 --- a/tests/auto/corelib/thread/qthreadpool/qthreadpool.pro +++ /dev/null @@ -1,4 +0,0 @@ -CONFIG += testcase -TARGET = tst_qthreadpool -QT = core testlib -SOURCES = tst_qthreadpool.cpp diff --git a/tests/auto/corelib/thread/qthreadstorage/crashonexit/crashonexit.pro b/tests/auto/corelib/thread/qthreadstorage/crashonexit/crashonexit.pro deleted file mode 100644 index 57bd78bcee..0000000000 --- a/tests/auto/corelib/thread/qthreadstorage/crashonexit/crashonexit.pro +++ /dev/null @@ -1,16 +0,0 @@ -SOURCES += crashOnExit.cpp -debug_and_release { - CONFIG(debug, debug|release) { - TARGET = ../../debug/crashOnExit_helper - } else { - TARGET = ../../release/crashOnExit_helper - } -} else { - TARGET = ../crashOnExit_helper -} -QT = core -CONFIG += cmdline - -# This app is testdata for tst_qthreadstorage -target.path = $$[QT_INSTALL_TESTS]/tst_qthreadstorage/$$TARGET -INSTALLS += target diff --git a/tests/auto/corelib/thread/qthreadstorage/qthreadstorage.pro b/tests/auto/corelib/thread/qthreadstorage/qthreadstorage.pro deleted file mode 100644 index c3eae5f7e1..0000000000 --- a/tests/auto/corelib/thread/qthreadstorage/qthreadstorage.pro +++ /dev/null @@ -1,8 +0,0 @@ -TEMPLATE = subdirs - -!android { - test.depends = crashonexit - SUBDIRS += crashonexit -} - -SUBDIRS += test diff --git a/tests/auto/corelib/thread/qthreadstorage/test/test.pro b/tests/auto/corelib/thread/qthreadstorage/test/test.pro deleted file mode 100644 index e0725d038e..0000000000 --- a/tests/auto/corelib/thread/qthreadstorage/test/test.pro +++ /dev/null @@ -1,16 +0,0 @@ -CONFIG += testcase -debug_and_release { - CONFIG(debug, debug|release) { - TARGET = ../../debug/tst_qthreadstorage - !android: TEST_HELPER_INSTALLS = ../../debug/crashonexit_helper - } else { - TARGET = ../../release/tst_qthreadstorage - !android: TEST_HELPER_INSTALLS = ../../release/crashonexit_helper - } -} else { - TARGET = ../tst_qthreadstorage - !android: TEST_HELPER_INSTALLS = ../crashonexit_helper -} -CONFIG += console -QT = core testlib -SOURCES = ../tst_qthreadstorage.cpp diff --git a/tests/auto/corelib/thread/qwaitcondition/qwaitcondition.pro b/tests/auto/corelib/thread/qwaitcondition/qwaitcondition.pro deleted file mode 100644 index 2098d9dd2f..0000000000 --- a/tests/auto/corelib/thread/qwaitcondition/qwaitcondition.pro +++ /dev/null @@ -1,4 +0,0 @@ -CONFIG += testcase -TARGET = tst_qwaitcondition -QT = core testlib -SOURCES = tst_qwaitcondition.cpp diff --git a/tests/auto/corelib/thread/qwritelocker/qwritelocker.pro b/tests/auto/corelib/thread/qwritelocker/qwritelocker.pro deleted file mode 100644 index a6c4f70b8d..0000000000 --- a/tests/auto/corelib/thread/qwritelocker/qwritelocker.pro +++ /dev/null @@ -1,4 +0,0 @@ -CONFIG += testcase -TARGET = tst_qwritelocker -QT = core testlib -SOURCES = tst_qwritelocker.cpp diff --git a/tests/auto/corelib/thread/thread.pro b/tests/auto/corelib/thread/thread.pro deleted file mode 100644 index d6e24b9b33..0000000000 --- a/tests/auto/corelib/thread/thread.pro +++ /dev/null @@ -1,34 +0,0 @@ -TEMPLATE=subdirs - -qtConfig(thread) { - SUBDIRS=\ - qatomicint \ - qatomicinteger \ - qatomicpointer \ - qresultstore \ - qfuture \ - qfuturesynchronizer \ - qmutex \ - qmutexlocker \ - qreadlocker \ - qreadwritelock \ - qsemaphore \ - qthread \ - qthreadonce \ - qthreadpool \ - qthreadstorage \ - qwaitcondition \ - qwritelocker \ - qpromise -} - -qtHaveModule(concurrent) { - SUBDIRS += \ - qfuturewatcher -} - -android: SUBDIRS -= \ - # QTBUG-87431 - qthreadstorage \ - # QTBUG-88136 - qfuturewatcher |