diff options
| -rw-r--r-- | Makefile | 3 | ||||
| -rwxr-xr-x | branding/scripts/gen-qtinstaller | 4 | ||||
| -rw-r--r-- | branding/templates/qtinstaller/config/config.xml | 2 | ||||
| -rw-r--r-- | branding/templates/qtinstaller/installer.pro | 2 |
4 files changed, 10 insertions, 1 deletions
@@ -142,6 +142,9 @@ installer: check_qtifw checksign @cp -r ${TEMPLATES}/qtinstaller/packages ${INSTALLER} @cp -r ${TEMPLATES}/qtinstaller/installer.pro ${INSTALLER} @cp -r ${TEMPLATES}/qtinstaller/config ${INSTALLER} + @cp ${VENDOR_PATH}/assets/icon.ico ${INSTALLER}/config/installer-icon.ico + @cp ${VENDOR_PATH}/assets/icon.icns ${INSTALLER}/config/installer-icon.icns + @cp ${VENDOR_PATH}/assets/installer-logo.png ${INSTALLER}/config/installer-logo.png ifeq (${PLATFORM}, darwin) @mkdir -p ${INST_DATA}/helper @VERSION=${VERSION} VENDOR_PATH=${VENDOR_PATH} ${SCRIPTS}/gen-qtinstaller osx ${INSTALLER} diff --git a/branding/scripts/gen-qtinstaller b/branding/scripts/gen-qtinstaller index 1f2c03d..04ecaf7 100755 --- a/branding/scripts/gen-qtinstaller +++ b/branding/scripts/gen-qtinstaller @@ -21,16 +21,20 @@ OS_CONFIG = { <RunProgramArguments> <Argument>@TargetDir@</Argument> </RunProgramArguments> + <WizardStyle>mac</WizardStyle> <!-- end osx --> """, 'windows': """ + <!-- windows --> <TargetDir>@ApplicationsDir@/$APPNAME</TargetDir> <StartMenuDir>$APPNAME</StartMenuDir> <RunProgram>@TargetDir@/$BINNAME.exe</RunProgram> <RunProgramArguments> </RunProgramArguments> + + <WizardStyle>Modern</WizardStyle> <!-- end windows --> """ } diff --git a/branding/templates/qtinstaller/config/config.xml b/branding/templates/qtinstaller/config/config.xml index 13dba49..df7b6d4 100644 --- a/branding/templates/qtinstaller/config/config.xml +++ b/branding/templates/qtinstaller/config/config.xml @@ -5,6 +5,8 @@ <Title>$APPNAME Installer ($VERSION)</Title> <Publisher>LEAP Encryption Access Project</Publisher> <AllowNonAsciiCharacters>false</AllowNonAsciiCharacters> + <Logo>installer-logo.png</Logo> + <InstallerApplicationIcon>installer-icon</InstallerApplicationIcon> <!-- <RemoteRepositories> diff --git a/branding/templates/qtinstaller/installer.pro b/branding/templates/qtinstaller/installer.pro index ec800c1..3d65334 100644 --- a/branding/templates/qtinstaller/installer.pro +++ b/branding/templates/qtinstaller/installer.pro @@ -5,7 +5,7 @@ CONFIG -= debug_and_release INPUT = $$PWD/config/config.xml $$PWD/packages inst.input = INPUT inst.output = $$INSTALLER -inst.commands = binarycreator -c $$PWD/config/config.xml -p $$PWD/packages ${QMAKE_FILE_OUT} +inst.commands = binarycreator --ignore-translations -c $$PWD/config/config.xml -p $$PWD/packages ${QMAKE_FILE_OUT} inst.CONFIG += target_predeps no_link combine QMAKE_EXTRA_COMPILERS += inst |