From 369f8195e8ce054c457ebca29ed6581d11ac7e69 Mon Sep 17 00:00:00 2001
From: Gerald Combs <gerald@wireshark.org>
Date: Wed, 24 Jan 2018 14:10:39 -0800
Subject: Qt+WiX: Skip translations.

We handle translations in QtTranslation.wxs so we need to skip them when
generating QtDependentComponents.wxs.

Change-Id: I05586c7f8fbbaf72fc30564a157ba1175154d1d3
Reviewed-on: https://code.wireshark.org/review/25459
Reviewed-by: Gerald Combs <gerald@wireshark.org>
---
 packaging/wix/windeployqt-to-wix.ps1 | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/packaging/wix/windeployqt-to-wix.ps1 b/packaging/wix/windeployqt-to-wix.ps1
index f8d5fd42fe..809ceacaf2 100644
--- a/packaging/wix/windeployqt-to-wix.ps1
+++ b/packaging/wix/windeployqt-to-wix.ps1
@@ -72,6 +72,7 @@ try {
         $wdqtList = windeployqt `
             --release `
             --no-compiler-runtime `
+            --no-translations `
             --list relative `
             $Executable
 
@@ -95,12 +96,6 @@ try {
       <ComponentGroup Id=`"CG.QtDependencies`">
 "
         foreach ($entry in $wdqtList) {
-            $entryPath = Join-Path -Path $dllPath -ChildPath $entry
-            if ($entry.EndsWith(".qm") -and -not (Test-Path $entryPath -PathType Leaf)) {
-                # Windeployqt --list can print translation files that
-                # don't exist (QTBUG-65974).
-                continue
-            }
             $dir = Split-Path -Parent $entry
             if ($dir) {
                 if ($dir -ne $currentDir) {
-- 
cgit v1.2.3