diff options
Diffstat (limited to 'tests/auto/corelib')
-rw-r--r-- | tests/auto/corelib/global/qlogging/BLACKLIST | 2 | ||||
-rw-r--r-- | tests/auto/corelib/plugin/.prev_CMakeLists.txt | 13 | ||||
-rw-r--r-- | tests/auto/corelib/plugin/CMakeLists.txt | 7 | ||||
-rw-r--r-- | tests/auto/corelib/thread/.prev_CMakeLists.txt | 25 | ||||
-rw-r--r-- | tests/auto/corelib/thread/CMakeLists.txt | 7 |
5 files changed, 52 insertions, 2 deletions
diff --git a/tests/auto/corelib/global/qlogging/BLACKLIST b/tests/auto/corelib/global/qlogging/BLACKLIST index e474064f54..e2d930e37b 100644 --- a/tests/auto/corelib/global/qlogging/BLACKLIST +++ b/tests/auto/corelib/global/qlogging/BLACKLIST @@ -5,3 +5,5 @@ b2qt 64bit [qMessagePattern:backtrace depth,separator] # QTBUG-63915 b2qt 64bit +# QTBUG-85364 +b2qt cmake diff --git a/tests/auto/corelib/plugin/.prev_CMakeLists.txt b/tests/auto/corelib/plugin/.prev_CMakeLists.txt new file mode 100644 index 0000000000..710d471e8a --- /dev/null +++ b/tests/auto/corelib/plugin/.prev_CMakeLists.txt @@ -0,0 +1,13 @@ +# Generated from plugin.pro. + +if(QT_BUILD_SHARED_LIBS) + add_subdirectory(qfactoryloader) +endif() +add_subdirectory(quuid) +if(QT_FEATURE_library) + add_subdirectory(qpluginloader) + add_subdirectory(qlibrary) +endif() +if(QT_BUILD_SHARED_LIBS AND QT_FEATURE_library) + add_subdirectory(qplugin) +endif() diff --git a/tests/auto/corelib/plugin/CMakeLists.txt b/tests/auto/corelib/plugin/CMakeLists.txt index 710d471e8a..13a97ed349 100644 --- a/tests/auto/corelib/plugin/CMakeLists.txt +++ b/tests/auto/corelib/plugin/CMakeLists.txt @@ -9,5 +9,10 @@ if(QT_FEATURE_library) add_subdirectory(qlibrary) endif() if(QT_BUILD_SHARED_LIBS AND QT_FEATURE_library) - add_subdirectory(qplugin) + # special case begin + # QTBUG-85364 + if(NOT LINUX) + add_subdirectory(qplugin) + endif() + # special case end endif() diff --git a/tests/auto/corelib/thread/.prev_CMakeLists.txt b/tests/auto/corelib/thread/.prev_CMakeLists.txt new file mode 100644 index 0000000000..b73d9af059 --- /dev/null +++ b/tests/auto/corelib/thread/.prev_CMakeLists.txt @@ -0,0 +1,25 @@ +# Generated from thread.pro. + +if(QT_FEATURE_thread) + add_subdirectory(qatomicint) + add_subdirectory(qatomicinteger) + add_subdirectory(qatomicpointer) + add_subdirectory(qresultstore) + add_subdirectory(qfuture) + add_subdirectory(qfuturesynchronizer) + add_subdirectory(qmutex) + add_subdirectory(qmutexlocker) + add_subdirectory(qreadlocker) + add_subdirectory(qreadwritelock) + add_subdirectory(qsemaphore) + add_subdirectory(qthread) + add_subdirectory(qthreadonce) + add_subdirectory(qthreadpool) + add_subdirectory(qthreadstorage) + add_subdirectory(qwaitcondition) + add_subdirectory(qwritelocker) + add_subdirectory(qpromise) +endif() +if(TARGET Qt::Concurrent) + add_subdirectory(qfuturewatcher) +endif() diff --git a/tests/auto/corelib/thread/CMakeLists.txt b/tests/auto/corelib/thread/CMakeLists.txt index b73d9af059..8c3e33d6dc 100644 --- a/tests/auto/corelib/thread/CMakeLists.txt +++ b/tests/auto/corelib/thread/CMakeLists.txt @@ -12,7 +12,12 @@ if(QT_FEATURE_thread) add_subdirectory(qreadlocker) add_subdirectory(qreadwritelock) add_subdirectory(qsemaphore) - add_subdirectory(qthread) + # special case begin + # QTBUG-85364 + if(NOT CMAKE_CROSSCOMPILING) + add_subdirectory(qthread) + endif() + # special case end add_subdirectory(qthreadonce) add_subdirectory(qthreadpool) add_subdirectory(qthreadstorage) |