Skip to content

Merge upstream commit to fix macos build #24

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
olehkuznetsov wants to merge 1 commit into from
Closed

Merge upstream commit to fix macos build #24

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,15 +24,15 @@ on:
jobs:
# Ensure we can build on an older Ubuntu distro with an older version of CMake.
linux_back_compat:
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name != github.event.pull_request.base.repo.full_name
name: "Ubuntu Backcompat"
steps:
- uses: actions/checkout@v6
- name: Install Qt
uses: jurplel/install-qt-action@v4
with:
version: '6.2.*'
version: '6.9.3'
- name: Test Minimum CMake Version
uses: lukka/get-cmake@latest
with:
Expand All @@ -57,7 +57,7 @@ jobs:
- name: Install Qt
uses: jurplel/install-qt-action@v4
with:
version: '6.8.3'
version: '6.9.3'
- name: Clone repository
uses: actions/checkout@v6
- run: sudo apt-get -qq update && sudo apt-get install -y libwayland-dev xorg-dev
Expand All @@ -74,7 +74,7 @@ jobs:
- name: Install Qt
uses: jurplel/install-qt-action@v4
with:
version: '6.8.2'
version: '6.9.3'
- run: cmake -S . -B build -D UPDATE_DEPS=ON -D BUILD_TESTS=ON -D RUN_ON_GITHUB=ON -D CMAKE_BUILD_TYPE=Debug -G Ninja
- run: cmake --build build
- run: ctest --output-on-failure --test-dir build --timeout 10
Expand Down Expand Up @@ -107,7 +107,7 @@ jobs:
- name: Install Qt
uses: jurplel/install-qt-action@v4
with:
version: '6.8.2'
version: '6.9.3'
- uses: lukka/get-cmake@latest
- name: Configure
run: |
Expand All @@ -127,7 +127,7 @@ jobs:
- uses: actions/checkout@v6
- uses: actions/setup-python@v6
with:
python-version: '3.10'
python-version: '3.11'
- uses: lukka/get-cmake@latest
- name: Generate build files
run: |
Expand Down Expand Up @@ -160,7 +160,7 @@ jobs:
key: mingw-ccache
- uses: actions/setup-python@v6
with:
python-version: '3.10'
python-version: '3.11'
- uses: lukka/get-cmake@latest
- name: GCC Version
run: gcc --version # If this fails MINGW is not setup correctly
Expand Down
1 change: 1 addition & 0 deletions vkconfig_gui/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

### Fixes:
- Fix dark mode message on Linux showing when not expected
- Fix configuration duplication and directly changing setting crash #2687

## Vulkan Configurator 3.5.0 - May 2026
[Vulkan SDK 1.4.350.0](https://github.com/LunarG/VulkanTools/tree/vulkan-sdk-1.4.350)
Expand Down
2 changes: 2 additions & 0 deletions vkconfig_gui/tab_configurations.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1019,6 +1019,8 @@ void TabConfigurations::OnContextMenuDuplicateClicked(ListItem *item) {
configurator.Override(OVERRIDE_AREA_LOADER_SETTINGS_BIT);

this->UpdateUI_Configurations(UPDATE_REBUILD_UI);
this->UpdateUI_Layers(UPDATE_REBUILD_UI);
this->UpdateUI_Settings(UPDATE_REBUILD_UI);
}

void TabConfigurations::OnContextMenuDeleteClicked(ListItem *item) {
Expand Down
Loading