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 "Require at least 6.7 for qt_generate_deploy_app_script"

Browse source 
This reverts commit 73c374ff29b6a77cb62e419ec251e4d240419a1f.
This commit is contained in:
Joshua Goins 2024-04-25 18:20:38 -04:00
parent a13466d3a5
commit 877c6c766e
2 changed files with 13 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -41,7 +41,7 @@ jobs:
- name: Install Qt - name: Install Qt
uses: jurplel/install-qt-action@v3 uses: jurplel/install-qt-action@v3
with: with:
version: "6.7.*" version: "6.6.*"
cache: true cache: true
modules: 'qthttpserver qtwebsockets' modules: 'qthttpserver qtwebsockets'

5
launcher/CMakeLists.txt
View file

@ -25,8 +25,6 @@ else()
install(FILES zone.xiv.novus.svg DESTINATION ${KDE_INSTALL_FULL_ICONDIR}/hicolor/scalable/apps) install(FILES zone.xiv.novus.svg DESTINATION ${KDE_INSTALL_FULL_ICONDIR}/hicolor/scalable/apps)
endif() endif()
# Qt 6.7 brings DEPLOY_TOOL_OPTIONS
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)
@ -40,6 +38,3 @@ if(QT_VERSION_MINOR LESS 7)
DEPLOY_TOOL_OPTIONS ${deploy_tool_options_arg} DEPLOY_TOOL_OPTIONS ${deploy_tool_options_arg}
) )
install(SCRIPT ${deploy_script}) install(SCRIPT ${deploy_script})
else()
message(INFO "App deployment requires Qt 6.7")
endif()