aboutsummaryrefslogtreecommitdiffstats
path: root/packaging/wix
diff options
context:
space:
mode:
Diffstat (limited to 'packaging/wix')
-rw-r--r--packaging/wix/CMakeLists.txt1
-rw-r--r--packaging/wix/windeployqt-to-wix.ps13
2 files changed, 4 insertions, 0 deletions
diff --git a/packaging/wix/CMakeLists.txt b/packaging/wix/CMakeLists.txt
index df8070431f..ba89480b62 100644
--- a/packaging/wix/CMakeLists.txt
+++ b/packaging/wix/CMakeLists.txt
@@ -266,6 +266,7 @@ macro( ADD_WIX_PACKAGE_TARGET )
COMMAND ${POWERSHELL_COMMAND} "${_wix_source_dir}/windeployqt-to-wix.ps1"
-Executable $<TARGET_FILE:wireshark>
-FilePath ${_wix_binary_dir}/QtDependentComponents.wxs
+ DEPENDS "${_wix_source_dir}/windeployqt-to-wix.ps1"
)
# SNMPMibs.wxs. Collects all MIBs in "output" snmp/mibs
diff --git a/packaging/wix/windeployqt-to-wix.ps1 b/packaging/wix/windeployqt-to-wix.ps1
index c90b97135a..a16964346f 100644
--- a/packaging/wix/windeployqt-to-wix.ps1
+++ b/packaging/wix/windeployqt-to-wix.ps1
@@ -62,6 +62,9 @@ try {
Throw "Qt " + $qtVersion + " found. 5.3 or later is required."
}
+ # windeployqt lists translation files that it don't exist (e.g.
+ # qtbase_ar.qm), so we handle those by hand.
+ # https://bugreports.qt.io/browse/QTBUG-65974
$wdqtList = windeployqt `
--release `
--no-compiler-runtime `