IPC: Move QSharedMemory and QSystemSemaphore from kernel/ to ipc/

It's not a lot of files, but it's actually more in the same dir than
mime/ does right now. I'm about to add two more files, though I'll also
merge a few more later.

Change-Id: Id8d5e3999fe94b03acc1fffd171bfe2ea36a35a7
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
bb10
Thiago Macieira 2022-10-07 21:37:54 -07:00
parent 7689d4ad2f
commit 53e8982434
28 changed files with 25 additions and 19 deletions

View File

@ -108,6 +108,8 @@ qt_internal_add_module(Core
global/q23functional.h
global/qxpfunctional.h
global/qxptype_traits.h
ipc/qsharedmemory.cpp ipc/qsharedmemory.h ipc/qsharedmemory_p.h
ipc/qsystemsemaphore.cpp ipc/qsystemsemaphore.h ipc/qsystemsemaphore_p.h
io/qabstractfileengine.cpp io/qabstractfileengine_p.h
io/qbuffer.cpp io/qbuffer.h
io/qdataurl.cpp io/qdataurl_p.h
@ -174,11 +176,9 @@ qt_internal_add_module(Core
kernel/qproperty.cpp kernel/qproperty.h kernel/qproperty_p.h
kernel/qpropertyprivate.h
kernel/qsequentialiterable.cpp kernel/qsequentialiterable.h
kernel/qsharedmemory.cpp kernel/qsharedmemory.h kernel/qsharedmemory_p.h
kernel/qsignalmapper.cpp kernel/qsignalmapper.h
kernel/qsocketnotifier.cpp kernel/qsocketnotifier.h
kernel/qsystemerror.cpp kernel/qsystemerror_p.h
kernel/qsystemsemaphore.cpp kernel/qsystemsemaphore.h kernel/qsystemsemaphore_p.h
kernel/qtestsupport_core.cpp kernel/qtestsupport_core.h
kernel/qtimer.cpp kernel/qtimer.h kernel/qtimer_p.h
kernel/qtranslator.cpp kernel/qtranslator.h kernel/qtranslator_p.h
@ -508,8 +508,8 @@ qt_internal_extend_target(Core
qt_internal_extend_target(Core CONDITION ANDROID
SOURCES
kernel/qsharedmemory_android.cpp
kernel/qsystemsemaphore_android.cpp
ipc/qsharedmemory_android.cpp
ipc/qsystemsemaphore_android.cpp
DEFINES
LIBS_SUFFIX="_${ANDROID_ABI}.so" # special case
)
@ -565,8 +565,8 @@ qt_internal_extend_target(Core CONDITION WIN32
kernel/qelapsedtimer_win.cpp
kernel/qeventdispatcher_win.cpp kernel/qeventdispatcher_win_p.h
kernel/qfunctions_win.cpp kernel/qfunctions_win_p.h kernel/qfunctions_winrt_p.h
kernel/qsharedmemory_win.cpp
kernel/qsystemsemaphore_win.cpp
ipc/qsharedmemory_win.cpp
ipc/qsystemsemaphore_win.cpp
kernel/qwineventnotifier.cpp kernel/qwineventnotifier.h kernel/qwineventnotifier_p.h
kernel/qwinregistry.cpp kernel/qwinregistry_p.h
plugin/qsystemlibrary.cpp plugin/qsystemlibrary_p.h
@ -1139,12 +1139,12 @@ qt_internal_extend_target(Core CONDITION QT_FEATURE_clock_gettime AND UNIX
qt_internal_extend_target(Core CONDITION UNIX AND NOT ANDROID
SOURCES
kernel/qsharedmemory_posix.cpp
kernel/qsharedmemory_systemv.cpp
kernel/qsharedmemory_unix.cpp
kernel/qsystemsemaphore_posix.cpp
kernel/qsystemsemaphore_systemv.cpp
kernel/qsystemsemaphore_unix.cpp
ipc/qsharedmemory_posix.cpp
ipc/qsharedmemory_systemv.cpp
ipc/qsharedmemory_unix.cpp
ipc/qsystemsemaphore_posix.cpp
ipc/qsystemsemaphore_systemv.cpp
ipc/qsystemsemaphore_unix.cpp
)
qt_internal_extend_target(Core CONDITION VXWORKS

View File

@ -19,7 +19,7 @@
#include <errno.h>
#if defined(Q_OS_DARWIN)
#include "qcore_mac_p.h"
#include "private/qcore_mac_p.h"
#endif
#include "private/qcore_unix_p.h"

View File

@ -8,6 +8,7 @@ if(NOT UIKIT)
add_subdirectory(animation)
add_subdirectory(global)
add_subdirectory(io)
add_subdirectory(ipc)
add_subdirectory(itemmodels)
add_subdirectory(mimetypes)
add_subdirectory(plugin)

View File

@ -0,0 +1,11 @@
# Copyright (C) 2022 Intel Corporation.
# SPDX-License-Identifier: BSD-3-Clause
if(NOT ANDROID AND NOT UIKIT)
if(QT_FEATURE_private_tests)
add_subdirectory(qsharedmemory)
endif()
if(QT_FEATURE_systemsemaphore)
add_subdirectory(qsystemsemaphore)
endif()
endif()

View File

@ -34,15 +34,9 @@ endif()
if(TARGET Qt::Network AND NOT ANDROID AND NOT UIKIT)
add_subdirectory(qobject)
endif()
if(QT_FEATURE_private_tests AND NOT ANDROID AND NOT UIKIT)
add_subdirectory(qsharedmemory)
endif()
if(QT_FEATURE_private_tests AND TARGET Qt::Network)
add_subdirectory(qsocketnotifier)
endif()
if(QT_FEATURE_systemsemaphore AND NOT ANDROID AND NOT UIKIT)
add_subdirectory(qsystemsemaphore)
endif()
if(WIN32)
add_subdirectory(qwineventnotifier)
add_subdirectory(qwinregistrykey)