diff options
| author | João Valverde <j@v6e.pt> | 2023-05-27 00:07:58 +0100 |
|---|---|---|
| committer | João Valverde <j@v6e.pt> | 2023-05-29 01:12:04 +0000 |
| commit | 155da04d67273e44a8ce57020bbaca56ff536bf6 (patch) | |
| tree | c263aaf1611378b5d7104838638cabdb74b7d5e2 /packaging/nsis | |
| parent | c17c11eeb87feac8d20cd14dffe9eaf4ba57b8ce (diff) | |
CMake: Remove SKIP_QT_TRANSLATIONS
Now that 6.5.1 is released, remove the work-around but keep the
warning.
Diffstat (limited to 'packaging/nsis')
| -rw-r--r-- | packaging/nsis/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | packaging/nsis/wireshark.nsi | 16 |
2 files changed, 7 insertions, 10 deletions
diff --git a/packaging/nsis/CMakeLists.txt b/packaging/nsis/CMakeLists.txt index b2dcf8215e..4125d3af74 100644 --- a/packaging/nsis/CMakeLists.txt +++ b/packaging/nsis/CMakeLists.txt @@ -331,7 +331,6 @@ macro( ADD_NSIS_PACKAGE_TARGETS ) $<$<CONFIG:Debug>:/DBUNDLE_DEBUG_DLLS> $<$<BOOL:${MSVC}>:/DUSE_VCREDIST> $<$<BOOL:${BUILD_etwdump}>:/DHAVE_ETWDUMP> - $<$<BOOL:${SKIP_QT_TRANSLATIONS}>:/DSKIP_QT_TRANSLATIONS> wireshark.nsi WORKING_DIRECTORY ${_nsis_source_dir} ) diff --git a/packaging/nsis/wireshark.nsi b/packaging/nsis/wireshark.nsi index fa361a3c09..5deef7c681 100644 --- a/packaging/nsis/wireshark.nsi +++ b/packaging/nsis/wireshark.nsi @@ -975,15 +975,13 @@ WriteRegStr HKEY_LOCAL_MACHINE "Software\Microsoft\Windows\CurrentVersion\App Pa WriteRegStr HKEY_LOCAL_MACHINE "Software\Microsoft\Windows\CurrentVersion\App Paths\${PROGRAM_NAME_PATH}" "Path" '$INSTDIR' !include wireshark-qt-manifest.nsh -!ifndef SKIP_QT_TRANSLATIONS - ${!defineifexist} TRANSLATIONS_FOLDER "${QT_DIR}\translations" - SetOutPath $INSTDIR - !ifdef TRANSLATIONS_FOLDER - ; Starting from Qt 5.5, *.qm files are put in a translations subfolder - File /r "${QT_DIR}\translations" - !else - File "${QT_DIR}\*.qm" - !endif +${!defineifexist} TRANSLATIONS_FOLDER "${QT_DIR}\translations" +SetOutPath $INSTDIR +!ifdef TRANSLATIONS_FOLDER + ; Starting from Qt 5.5, *.qm files are put in a translations subfolder + File /r "${QT_DIR}\translations" +!else + File "${QT_DIR}\*.qm" !endif ; Is the Start Menu check box checked? |