CMake: Remove SKIP_QT_TRANSLATIONS

Now that 6.5.1 is released, remove the work-around but keep the
warning.

diff --git a/CMakeLists.txt b/CMakeLists.txt
index f96053bf48be86eaa5ca49d0d1751b7947b78ca6..a870cea068df1e93574aa2d662838fa49057ebeb 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2775,9 +2775,8 @@ if(BUILD_wireshark AND QT_FOUND)
                if (USE_MSYSTEM AND Qt${qtver}Widgets_VERSION VERSION_EQUAL 6.5.0)
                        # windeployqt released with Qt 6.5.0 is broken.
                        # https://bugreports.qt.io/browse/QTBUG-112204
-                       message(WARNING "Qt Deploy Tool 6.5.0 is broken, skipping translations.")
-                       list(APPEND QT_WINDEPLOYQT_EXTRA_ARGS --no-translations)
-                       set(SKIP_QT_TRANSLATIONS True)
+                       message(WARNING "Qt Deploy Tool 6.5.0 is broken, please upgrade to a later version.")
+                       # lconvert will fail
                endif()
                add_custom_command(TARGET copy_qt_dlls
                        POST_BUILD

diff --git a/packaging/nsis/CMakeLists.txt b/packaging/nsis/CMakeLists.txt
index b2dcf8215e6e5f85ea0e5c1c403b00d85c735421..4125d3af74ebb5c66707a8206c3e3e89b28c7488 100644 (file)
--- 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 fa361a3c0929793b9a68f6fc34a3550dc251520c..5deef7c681fc712e0ae8952354380f7e00ab1ebb 100644 (file)
--- 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?