From 348881f55841b76787ef3e7747f093abeebd331d Mon Sep 17 00:00:00 2001 From: Mike Solar Date: Sun, 2 Aug 2026 21:29:03 +0800 Subject: [PATCH] ci: fix Qt6.4 QLatin1String::toUtf8 and stale Windows shm branch - import.cpp: pass the const char* input ids directly; the QLatin1String roundtrip uses toUtf8(), unavailable in distro Qt 6.4 - sharedmemoryregion.cpp: the Windows branch still used the pre-refactor API (Open/Close/kCreate); rewritten to the current lowercase open/close/k_create interface --- app/widget/timelinewidget/tool/import.cpp | 4 ++-- engine/render/ipc/sharedmemoryregion.cpp | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/app/widget/timelinewidget/tool/import.cpp b/app/widget/timelinewidget/tool/import.cpp index 2ac4f226d..a917128e4 100644 --- a/app/widget/timelinewidget/tool/import.cpp +++ b/app/widget/timelinewidget/tool/import.cpp @@ -575,7 +575,7 @@ void ImportTool::drop_ghosts(bool insert, void *parent_command) oakengine_node_connect_command( footage_stream.footage, reinterpret_cast(transform), - QLatin1String(oakengine_transform_texture_input_id()).toUtf8().constData(), + oakengine_transform_texture_input_id(), -1)); oakengine_undo_command_multi_add_child( command, @@ -607,7 +607,7 @@ void ImportTool::drop_ghosts(bool insert, void *parent_command) oakengine_node_connect_command( footage_stream.footage, reinterpret_cast(volume_node), - QLatin1String(oakengine_volume_samples_input_id()).toUtf8().constData(), + oakengine_volume_samples_input_id(), -1)); oakengine_undo_command_multi_add_child( command, diff --git a/engine/render/ipc/sharedmemoryregion.cpp b/engine/render/ipc/sharedmemoryregion.cpp index 38a481478..cef61cdb7 100644 --- a/engine/render/ipc/sharedmemoryregion.cpp +++ b/engine/render/ipc/sharedmemoryregion.cpp @@ -66,9 +66,9 @@ QString SharedMemoryRegion::make_key(qint64 owner_pid, int worker_index) #if defined(Q_OS_WIN) -bool SharedMemoryRegion::Open(const QString &key, size_t size, Mode mode) +bool SharedMemoryRegion::open(const QString &key, size_t size, Mode mode) { - Close(); + close(); key_ = key; size_ = size; @@ -78,7 +78,7 @@ bool SharedMemoryRegion::Open(const QString &key, size_t size, Mode mode) const QString mapping_name = QStringLiteral("Local\\") + key; const std::wstring wname = mapping_name.toStdWString(); - if (mode == kCreate) { + if (mode == k_create) { const DWORD size_high = static_cast((quint64(size) >> 32) & 0xFFFFFFFF); const DWORD size_low = static_cast(quint64(size) & 0xFFFFFFFF); @@ -114,13 +114,13 @@ bool SharedMemoryRegion::Open(const QString &key, size_t size, Mode mode) return false; } - if (mode == kCreate) { + if (mode == k_create) { memset(data_, 0, size); } return true; } -void SharedMemoryRegion::Close() +void SharedMemoryRegion::close() { if (data_) { UnmapViewOfFile(data_);