From 76b6daa02ebf65498018c36c95146d0e27d7ff71 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20T=C5=AFma?= Date: Sat, 19 Mar 2022 14:21:19 +0100 Subject: [PATCH] Ifdef NSIS stuff not used in Qt6 builds --- pkg/gpxsee64.nsi | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/pkg/gpxsee64.nsi b/pkg/gpxsee64.nsi index 7fde3d2d..f2759b59 100644 --- a/pkg/gpxsee64.nsi +++ b/pkg/gpxsee64.nsi @@ -439,27 +439,31 @@ SectionEnd ;------------------------------- -;Descriptions +; Descriptions -;Language strings +; Language strings LangString DESC_QT ${LANG_ENGLISH} \ "QT cross-platform application framework." LangString DESC_MSVC ${LANG_ENGLISH} \ "Microsoft Visual C++ 2017 runtime. If already installed, will be skipped." LangString DESC_OPENSSL ${LANG_ENGLISH} \ "OpenSSL library. Required for HTTPS to work." +!ifndef QT6 LangString DESC_ANGLE ${LANG_ENGLISH} \ "ANGLE (OpenGL via Direct3D). Enables OpenGL on systems without native OpenGL drivers." +!endif LangString DESC_APP ${LANG_ENGLISH} \ "GPXSee application" LangString DESC_LOCALIZATION ${LANG_ENGLISH} \ "Localization" -;Assign language strings to sections +; Assign language strings to sections !insertmacro MUI_FUNCTION_DESCRIPTION_BEGIN !insertmacro MUI_DESCRIPTION_TEXT ${SEC_QT} $(DESC_QT) !insertmacro MUI_DESCRIPTION_TEXT ${SEC_OPENSSL} $(DESC_OPENSSL) +!ifndef QT6 !insertmacro MUI_DESCRIPTION_TEXT ${SEC_ANGLE} $(DESC_ANGLE) +!endif !insertmacro MUI_DESCRIPTION_TEXT ${SEC_MSVC} $(DESC_MSVC) !insertmacro MUI_DESCRIPTION_TEXT ${SEC_APP} $(DESC_APP) !insertmacro MUI_DESCRIPTION_TEXT ${SEC_LOCALIZATION} $(DESC_LOCALIZATION)