summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorThiago Macieira <thiago.macieira@intel.com>2022-10-08 00:25:17 -0700
committerThiago Macieira <thiago.macieira@intel.com>2023-01-22 13:01:55 -0300
commit7809caa9244d3f6aedddcd9138e16be1806ded06 (patch)
tree8dd31044767cb79fdfebfe63c6e04d8b6c51a3f0 /tests
parent461463b75dafda4d216e297cba37f6b7388cf12c (diff)
IPC: move makePlatformSafeKey to qtipccommon.cpp
This removes the second portion of the #if mess of shared code between QSharedMemory and QSystemSemaphore for SystemV. Change-Id: Id8d5e3999fe94b03acc1fffd171c073c2873206e Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Diffstat (limited to 'tests')
-rw-r--r--tests/auto/corelib/ipc/qsharedmemory/tst_qsharedmemory.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/auto/corelib/ipc/qsharedmemory/tst_qsharedmemory.cpp b/tests/auto/corelib/ipc/qsharedmemory/tst_qsharedmemory.cpp
index 2bf8a74a1e..3dde642152 100644
--- a/tests/auto/corelib/ipc/qsharedmemory/tst_qsharedmemory.cpp
+++ b/tests/auto/corelib/ipc/qsharedmemory/tst_qsharedmemory.cpp
@@ -135,7 +135,7 @@ void tst_QSharedMemory::cleanup()
}
#ifndef Q_OS_WIN
-#include <private/qsharedmemory_p.h>
+#include <private/qtipccommon_p.h>
#include <sys/types.h>
#ifndef QT_POSIX_IPC
#include <sys/ipc.h>
@@ -157,7 +157,7 @@ int tst_QSharedMemory::remove(const QString &key)
if (key.isEmpty())
return -1;
- QString fileName = QSharedMemoryPrivate::makePlatformSafeKey(key);
+ QString fileName = QtIpcCommon::legacyPlatformSafeKey(key, QtIpcCommon::IpcType::SharedMemory);
#ifndef QT_POSIX_IPC
// ftok requires that an actual file exists somewhere