From de1545e19a39efcb43b6f6b41c1689f7b3d7d34a Mon Sep 17 00:00:00 2001 From: c0sxm0s Date: Thu, 17 Sep 2026 12:13:20 +0100 Subject: [PATCH] launcher: wire cancel->reject in C++; document glslang for Windows (#663) uic from Qt 6.12.0 crashes (0xC0000005) on any non-empty block in .ui files. Move the cancel_button -> reject connection from configuration_edit_dialog.ui into configurationEditDialog.cpp, matching how the other buttons are already connected there. Also document the glslang (glslangValidator) requirement for Windows builds; CMake requires it via find_program(... REQUIRED). --- README.md | 1 + src/launcher/forms/configuration_edit_dialog.ui | 8 -------- src/launcher/src/configurationEditDialog.cpp | 1 + 3 files changed, 2 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index ef1cf3ddc..cea72a964 100644 --- a/README.md +++ b/README.md @@ -137,6 +137,7 @@ the Vulkan/SPIR-V validation rules. - Visual Studio 2022 or Build Tools 2022 with the **Desktop development with C++** workload and **C++ Clang tools for Windows** component - Qt 6 for MSVC 2022 64-bit, including Concurrent, Network, and Widgets +- [glslang](https://github.com/KhronosGroup/glslang/releases) (`glslangValidator`) on `PATH` The Microsoft C++ compiler (`cl.exe`) is not supported; use `clang-cl`. diff --git a/src/launcher/forms/configuration_edit_dialog.ui b/src/launcher/forms/configuration_edit_dialog.ui index e3f3ecb46..92d91333a 100644 --- a/src/launcher/forms/configuration_edit_dialog.ui +++ b/src/launcher/forms/configuration_edit_dialog.ui @@ -329,12 +329,4 @@ - - - cancel_button - clicked() - ConfigurationEditDialog - reject() - - diff --git a/src/launcher/src/configurationEditDialog.cpp b/src/launcher/src/configurationEditDialog.cpp index 32e38e311..6840fd734 100644 --- a/src/launcher/src/configurationEditDialog.cpp +++ b/src/launcher/src/configurationEditDialog.cpp @@ -108,6 +108,7 @@ ConfigurationEditDialog::ConfigurationEditDialog(Configuration& info, QWidget* p InitGameDirectories(); connect(m_ui->ok_button, &QPushButton::clicked, this, &ConfigurationEditDialog::save); + connect(m_ui->cancel_button, &QPushButton::clicked, this, &QDialog::reject); connect(m_ui->clear_button, &QPushButton::clicked, this, &ConfigurationEditDialog::clear); connect(m_ui->comboBox_shader_log_direction, &QComboBox::currentTextChanged, this, [this](const QString& text) {