Skip to content

Commit b0171b6

Browse files
committed
Update the license notice included with MSI Installer for Windows
This commit include changes that are missing from recent '73ebe93ef0eb07247457c03eab532934a38d9679' commits.
1 parent 1ff08ae commit b0171b6

File tree

1 file changed

+22
-2
lines changed

1 file changed

+22
-2
lines changed

.github/patch/product.wxs.patch

Lines changed: 22 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
diff --git a/installer/windows/product.wxs b/installer/windows/product.wxs
2-
index c040591a..23a9b40a 100644
2+
index c040591a..12c3aee8 100644
33
--- a/installer/windows/product.wxs
44
+++ b/installer/windows/product.wxs
55
@@ -63,7 +63,8 @@
@@ -12,7 +12,17 @@ index c040591a..23a9b40a 100644
1212
</Directory>
1313
<Directory Id="imageformats" Name="imageformats">
1414
<Component><File Source="$(var.QtPath)\plugins\imageformats\qgif.dll" /></Component>
15-
@@ -149,8 +150,11 @@
15+
@@ -84,6 +85,9 @@
16+
</Directory>
17+
<Directory Id="licenses" Name="licenses">
18+
<Component><File Source="..\..\LICENSE" /></Component>
19+
+ <Component><File Source="..\..\LICENSE-GPL-3.0" /></Component>
20+
+ <Component><File Source="..\..\LICENSE-MIT" /></Component>
21+
+ <Component><File Source="..\..\LICENSE-MPL-2.0" /></Component>
22+
<Component><File Source="..\..\LICENSE-PLUGINS" /></Component>
23+
</Directory>
24+
<Component><File Source="$(var.QtPath)\bin\Qt5Concurrent.dll" /></Component>
25+
@@ -149,8 +153,11 @@
1626
<Feature Id="FormatsExtension" Title="Formats" Description="Provide additional field display formats." AllowAdvertise="no">
1727
<ComponentRef Id="formats.dll" />
1828
</Feature>
@@ -25,3 +35,13 @@ index c040591a..23a9b40a 100644
2535
</Feature>
2636
</Feature>
2737

38+
@@ -186,6 +193,9 @@
39+
<ComponentRef Id="windowsprintersupport.dll" />
40+
<!-- Licenses -->
41+
<ComponentRef Id="LICENSE" />
42+
+ <ComponentRef Id="LICENSE_GPL_3.0" />
43+
+ <ComponentRef Id="LICENSE_MIT" />
44+
+ <ComponentRef Id="LICENSE_MPL_2.0" />
45+
<ComponentRef Id="LICENSE_PLUGINS" />
46+
<!-- Qt -->
47+
<ComponentRef Id="Qt5Concurrent.dll" />

0 commit comments

Comments
 (0)