From 13eaab130c333186ce73a6f06d1942d8c93cc94e Mon Sep 17 00:00:00 2001 From: Joshua Goins Date: Thu, 25 Apr 2024 18:20:37 -0400 Subject: [PATCH] Revert "Fix deployment not working despite 6.7" This reverts commit 4c4a6f90db5b0731ebf62a995023afd0451c628a. --- .github/workflows/cmake-multi-platform.yml | 1 - launcher/CMakeLists.txt | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/cmake-multi-platform.yml b/.github/workflows/cmake-multi-platform.yml index c1b87ab..fc95f95 100644 --- a/.github/workflows/cmake-multi-platform.yml +++ b/.github/workflows/cmake-multi-platform.yml @@ -265,7 +265,6 @@ 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 ac8f8a2..7ae2a22 100644 --- a/launcher/CMakeLists.txt +++ b/launcher/CMakeLists.txt @@ -26,7 +26,7 @@ else() endif() # Qt 6.7 brings DEPLOY_TOOL_OPTIONS -if(Qt6_VERSION_MINOR LESS 7) +if(QT_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)