redstrate/novus
1
Fork 0
mirror of https://github.com/redstrate/Novus.git synced 2025-05-19 06:47:44 +00:00
Code Activity

Revert "Fix deployment not working despite 6.7"

Browse source 
This reverts commit 4c4a6f90db5b0731ebf62a995023afd0451c628a.
This commit is contained in:
Joshua Goins 2024-04-25 18:20:37 -04:00
parent 4458ee8ad6
commit 13eaab130c
2 changed files with 1 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
.github/workflows/cmake-multi-platform.yml vendored
View file

@ -265,7 +265,6 @@ jobs:
- name: Save Prefix - name: Save Prefix
id: cache-prefix-save id: cache-prefix-save
uses: actions/cache/save@v4 uses: actions/cache/save@v4
if: steps.cache-prefix-restore.outputs.cache-hit != 'true'
with: with:
path: ${{ steps.strings.outputs.prefix-dir }} path: ${{ steps.strings.outputs.prefix-dir }}
key: ${{ steps.cache-prefix-restore.outputs.cache-primary-key }} key: ${{ steps.cache-prefix-restore.outputs.cache-primary-key }}

2
launcher/CMakeLists.txt
View file

@ -26,7 +26,7 @@ else()
endif() endif()
# Qt 6.7 brings DEPLOY_TOOL_OPTIONS # Qt 6.7 brings DEPLOY_TOOL_OPTIONS
if(Qt6_VERSION_MINOR LESS 7) if(QT_VERSION_MINOR LESS 7)
set(deploy_tool_options_arg "") set(deploy_tool_options_arg "")
if (WIN32) 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) 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)