From 5f83f5147732bd8d2280319c10338fa0435c42f7 Mon Sep 17 00:00:00 2001 From: Joshua Goins Date: Wed, 24 Apr 2024 23:43:02 -0400 Subject: [PATCH] Fix deployment not working despite 6.7 --- .github/workflows/cmake-multi-platform.yml | 1 + launcher/CMakeLists.txt | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/cmake-multi-platform.yml b/.github/workflows/cmake-multi-platform.yml index fc95f95..c1b87ab 100644 --- a/.github/workflows/cmake-multi-platform.yml +++ b/.github/workflows/cmake-multi-platform.yml @@ -265,6 +265,7 @@ jobs: - name: Save Prefix id: cache-prefix-save uses: actions/cache/save@v4 + if: steps.cache-prefix-restore.outputs.cache-hit != 'true' with: path: ${{ steps.strings.outputs.prefix-dir }} key: ${{ steps.cache-prefix-restore.outputs.cache-primary-key }} diff --git a/launcher/CMakeLists.txt b/launcher/CMakeLists.txt index 7ae2a22..ac8f8a2 100644 --- a/launcher/CMakeLists.txt +++ b/launcher/CMakeLists.txt @@ -26,7 +26,7 @@ else() endif() # Qt 6.7 brings DEPLOY_TOOL_OPTIONS -if(QT_VERSION_MINOR LESS 7) +if(Qt6_VERSION_MINOR LESS 7) set(deploy_tool_options_arg "") if (WIN32) set(deploy_tool_options_arg --no-quick-import --no-virtualkeyboard --no-opengl-sw --plugindir "${CMAKE_INSTALL_PREFIX}/bin/bin/plugins" --libdir "${CMAKE_INSTALL_PREFIX}/bin/bin/" --no-translations)