aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGerald Combs <gerald@wireshark.org>2018-01-24 14:10:39 -0800
committerGerald Combs <gerald@wireshark.org>2018-01-24 22:15:50 +0000
commit369f8195e8ce054c457ebca29ed6581d11ac7e69 (patch)
treec605b97608f1d42060430e6a69358b9e82b6cae2
parentae5e83a25c7a75dea3553a32de8bae1cc036f7f9 (diff)
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>
-rw-r--r--packaging/wix/windeployqt-to-wix.ps17
1 files changed, 1 insertions, 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) {