oak-team/oak-editor
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ci: fix Qt6.4 QLatin1String::toUtf8 and stale Windows shm branch

Browse Source 
- 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
This commit is contained in:
Mike-Solar
2026-08-02 21:29:03 +08:00
parent 4f13e20fff
commit 348881f558
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/widget/timelinewidget/tool/import.cpp
+2 -2
View File
@@ -575,7 +575,7 @@ void ImportTool::drop_ghosts(bool insert, void *parent_command)
oakengine_node_connect_command( oakengine_node_connect_command(
footage_stream.footage, footage_stream.footage,
reinterpret_cast<OakEngineNode *>(transform), reinterpret_cast<OakEngineNode *>(transform),
QLatin1String(oakengine_transform_texture_input_id()).toUtf8().constData(), oakengine_transform_texture_input_id(),
-1)); -1));
oakengine_undo_command_multi_add_child( oakengine_undo_command_multi_add_child(
command, command,
@@ -607,7 +607,7 @@ void ImportTool::drop_ghosts(bool insert, void *parent_command)
oakengine_node_connect_command( oakengine_node_connect_command(
footage_stream.footage, footage_stream.footage,
reinterpret_cast<OakEngineNode *>(volume_node), reinterpret_cast<OakEngineNode *>(volume_node),
QLatin1String(oakengine_volume_samples_input_id()).toUtf8().constData(), oakengine_volume_samples_input_id(),
-1)); -1));
oakengine_undo_command_multi_add_child( oakengine_undo_command_multi_add_child(
command, command,
engine/render/ipc/sharedmemoryregion.cpp
+5 -5
View File
@@ -66,9 +66,9 @@ QString SharedMemoryRegion::make_key(qint64 owner_pid, int worker_index)
#if defined(Q_OS_WIN) #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; key_ = key;
size_ = size; 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 QString mapping_name = QStringLiteral("Local\\") + key;
const std::wstring wname = mapping_name.toStdWString(); const std::wstring wname = mapping_name.toStdWString();
if (mode == kCreate) { if (mode == k_create) {
const DWORD size_high = const DWORD size_high =
static_cast<DWORD>((quint64(size) >> 32) & 0xFFFFFFFF); static_cast<DWORD>((quint64(size) >> 32) & 0xFFFFFFFF);
const DWORD size_low = static_cast<DWORD>(quint64(size) & 0xFFFFFFFF); const DWORD size_low = static_cast<DWORD>(quint64(size) & 0xFFFFFFFF);
@@ -114,13 +114,13 @@ bool SharedMemoryRegion::Open(const QString &key, size_t size, Mode mode)
return false; return false;
} }
if (mode == kCreate) { if (mode == k_create) {
memset(data_, 0, size); memset(data_, 0, size);
} }
return true; return true;
} }
void SharedMemoryRegion::Close() void SharedMemoryRegion::close()
{ {
if (data_) { if (data_) {
UnmapViewOfFile(data_); UnmapViewOfFile(data_);