From c769432cd518d5e8ca20725083c42edd682d2ede Mon Sep 17 00:00:00 2001 From: Alexey Edelev Date: Thu, 9 Jun 2022 11:22:28 +0200 Subject: [PATCH] Move threads header files out of the FEATURE_thread Threads header files are used across the project without the check for FEATURE_thread enabled. So moving them out of the FEATURE_thread condition in CMake file to make them part of the CMake source tree even if FEATURE_thread is disabled. Change-Id: I8ee4ee5ffa16054b9af0df0aa5704b0f87678e1a Reviewed-by: Alexandru Croitor Reviewed-by: Thiago Macieira --- src/corelib/CMakeLists.txt | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/src/corelib/CMakeLists.txt b/src/corelib/CMakeLists.txt index 7f5417430a..f89aaae573 100644 --- a/src/corelib/CMakeLists.txt +++ b/src/corelib/CMakeLists.txt @@ -208,10 +208,17 @@ qt_internal_add_module(Core text/qunicodetools.cpp text/qunicodetools_p.h text/qutf8stringview.h text/qvsnprintf.cpp + thread/qatomic.h + thread/qatomic_bootstrap.h + thread/qatomic_cxx11.h + thread/qbasicatomic.h + thread/qgenericatomic.h + thread/qlocking_p.h thread/qmutex.h + thread/qorderedmutexlocker_p.h thread/qreadwritelock.h thread/qrunnable.cpp thread/qrunnable.h - thread/qthread.cpp thread/qthread.h + thread/qthread.cpp thread/qthread.h thread/qthread_p.h thread/qthreadstorage.h thread/qtsan_impl.h thread/qwaitcondition.h thread/qwaitcondition_p.h @@ -643,18 +650,11 @@ qt_internal_extend_target(Core CONDITION UNIX qt_internal_extend_target(Core CONDITION QT_FEATURE_thread SOURCES - thread/qatomic.cpp thread/qatomic.h - thread/qatomic_bootstrap.h - thread/qatomic_cxx11.h - thread/qbasicatomic.h + thread/qatomic.cpp thread/qfutex_p.h - thread/qgenericatomic.h - thread/qlocking_p.h thread/qmutex.cpp thread/qmutex_p.h - thread/qorderedmutexlocker_p.h thread/qreadwritelock.cpp thread/qreadwritelock_p.h thread/qsemaphore.cpp thread/qsemaphore.h - thread/qthread_p.h thread/qthreadpool.cpp thread/qthreadpool.h thread/qthreadpool_p.h thread/qthreadstorage.cpp )