Skip to content

Commit a6fa7b0

Browse files
committed
Update WiX configuration for Qt 5.4
1 parent 55e7bf1 commit a6fa7b0

File tree

1 file changed

+26
-25
lines changed

1 file changed

+26
-25
lines changed

CuteMarkEd.wxs

Lines changed: 26 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -3,34 +3,33 @@
33
<?define ManufacturerName="CuteMarkEd Project"?>
44
<?define ProductName="CuteMarkEd"?>
55
<?define ProductVersion="0.11.3"?>
6-
<Product Name="$(var.ProductName)"
7-
Id="*"
6+
<Product Name="$(var.ProductName)"
7+
Id="*"
88
UpgradeCode="335156FC-CB7F-4357-98D4-B5519E66402B"
9-
Language="1033"
10-
Version="$(var.ProductVersion)"
9+
Language="1033"
10+
Version="$(var.ProductVersion)"
1111
Manufacturer="$(var.ManufacturerName)">
1212

1313
<Package Id="*"
14-
InstallerVersion="200"
14+
InstallerVersion="200"
1515
Compressed="yes"
1616
Description="CuteMarkEd Installer"
1717
Manufacturer="$(var.ManufacturerName)"
1818
/>
1919

20-
<Media Id="1"
21-
Cabinet="cutemarked.cab"
20+
<Media Id="1"
21+
Cabinet="cutemarked.cab"
2222
EmbedCab="yes"
2323
/>
2424

2525
<MajorUpgrade
2626
DowngradeErrorMessage="CuteMarkEd is already installed with a higher version."
2727
AllowSameVersionUpgrades="yes" />
2828

29-
<!-- Directory tree -->
30-
<Directory Id="TARGETDIR" Name="SourceDir">
29+
<!-- Directory tree -->
30+
<Directory Id="TARGETDIR" Name="SourceDir">
3131
<Directory Id="ProgramFilesFolder">
3232
<Directory Id="INSTALLDIR" Name="$(var.ProductName)">
33-
<Directory Id="accessible" Name="accessible"/>
3433
<Directory Id="dictionaries" Name="dictionaries"/>
3534
<Directory Id="iconengines" Name="iconengines"/>
3635
<Directory Id="imageformats" Name="imageformats"/>
@@ -39,7 +38,7 @@
3938
<Directory Id="translations" Name="translations"/>
4039
</Directory>
4140
</Directory>
42-
41+
4342
<Directory Id="ProgramMenuFolder">
4443
<Directory Id="ProgramMenuDir" Name="$(var.ProductName) $(var.ProductVersion)">
4544
<Component Id="ApplicationShortcuts" Guid="EDF171FF-255B-4036-A363-C81D6E0F4F21">
@@ -80,13 +79,14 @@
8079
<File Id="Qt5QuickLibrary" Source="Qt5Quick.dll"/>
8180
<File Id="Qt5SensorsLibrary" Source="Qt5Sensors.dll"/>
8281
<File Id="Qt5SqlLibrary" Source="Qt5Sql.dll"/>
82+
<File Id="Qt5WebChannelLibrary" Source="Qt5WebChannel.dll"/>
8383
<File Id="Qt5WebKitLibrary" Source="Qt5WebKit.dll"/>
8484
<File Id="Qt5WebKitWidgetsLibrary" Source="Qt5WebKitWidgets.dll"/>
8585
<File Id="Qt5WidgetsLibrary" Source="Qt5Widgets.dll"/>
8686
<File Id="Qt5WinExtras" Source="Qt5WinExtras.dll"/>
87-
<File Id="icudt51Library" Source="icudt51.dll"/>
88-
<File Id="icuin51Library" Source="icuin51.dll"/>
89-
<File Id="icuuc51Library" Source="icuuc51.dll"/>
87+
<File Id="icudt53Library" Source="icudt53.dll"/>
88+
<File Id="icuin53Library" Source="icuin53.dll"/>
89+
<File Id="icuuc53Library" Source="icuuc53.dll"/>
9090
<File Id="libgcc_s_dw2Library" Source="libgcc_s_dw2-1.dll"/>
9191
<File Id="libstdcppLibrary" Source="libstdc++-6.dll"/>
9292
<File Id="libwinpthreadLibrary" Source="libwinpthread-1.dll"/>
@@ -110,12 +110,6 @@
110110
</Component>
111111
</DirectoryRef>
112112

113-
<DirectoryRef Id="accessible">
114-
<Component Id="QtAccessiblityComponent" Guid="A4B2D7FA-3B7F-4F03-B3B1-AF5C212F4B44" DiskId="1">
115-
<File Id="QtAccessibleWidgetsPlugin" Source="accessible/qtaccessiblewidgets.dll"/>
116-
</Component>
117-
</DirectoryRef>
118-
119113
<DirectoryRef Id="dictionaries">
120114
<Component Id="DictionariesComponent" Guid="AAC09D8C-FFD2-46DF-BDA2-081D26AFF431" DiskId="1">
121115
<File Id="cs_CZ.aff" Source="dictionaries/cs_CZ.aff"/>
@@ -132,7 +126,7 @@
132126
<File Id="README_en_US.txt" Source="dictionaries/README_en_US.txt"/>
133127
</Component>
134128
</DirectoryRef>
135-
129+
136130
<!-- Fontawesome Icon Engine -->
137131
<DirectoryRef Id="iconengines">
138132
<Component Id="IconEngineComponent" Guid="E7E34602-4099-4A73-8533-7631EF7D598A" DiskId="1">
@@ -142,14 +136,17 @@
142136

143137
<DirectoryRef Id="imageformats">
144138
<Component Id="QtImageFormatsComponent" Guid="B688FB5F-318F-494D-BF56-C83F3BB3F946" DiskId="1">
139+
<File Id="QtDdsPlugin" Source="imageformats/qdds.dll"/>
145140
<File Id="QtGifPlugin" Source="imageformats/qgif.dll"/>
146141
<File Id="QtIcoPlugin" Source="imageformats/qico.dll"/>
142+
<File Id="QtJp2Plugin" Source="imageformats/qjp2.dll"/>
147143
<File Id="QtJpegPlugin" Source="imageformats/qjpeg.dll"/>
148144
<File Id="QtMngPlugin" Source="imageformats/qmng.dll"/>
149145
<File Id="QtSvgPlugin" Source="imageformats/qsvg.dll"/>
150146
<File Id="QtTgaPlugin" Source="imageformats/qtga.dll"/>
151147
<File Id="QtTiffPlugin" Source="imageformats/qtiff.dll"/>
152148
<File Id="QtWbmpPlugin" Source="imageformats/qwbmp.dll"/>
149+
<File Id="QtWebpPlugin" Source="imageformats/qwebp.dll"/>
153150
</Component>
154151
</DirectoryRef>
155152

@@ -168,22 +165,26 @@
168165
<DirectoryRef Id="translations">
169166
<Component Id="QtTranslationsComponent" Guid="245EDE4C-00C9-4FA9-9E78-D4B1C526AAF0" DiskId="1">
170167
<File Id="QtCSTranslation" Source="translations/qt_cs.qm"/>
168+
<File Id="QtDATranslation" Source="translations/qt_da.qm"/>
171169
<File Id="QtDETranslation" Source="translations/qt_de.qm"/>
170+
<File Id="QtESTranslation" Source="translations/qt_es.qm"/>
171+
<File Id="QtFRTranslation" Source="translations/qt_fr.qm"/>
172172
<File Id="QtHUTranslation" Source="translations/qt_hu.qm"/>
173173
<File Id="QtITTranslation" Source="translations/qt_it.qm"/>
174174
<File Id="QtJATranslation" Source="translations/qt_ja.qm"/>
175+
<File Id="QtPLTranslation" Source="translations/qt_pl.qm"/>
176+
<File Id="QtPTTranslation" Source="translations/qt_pt.qm"/>
175177
<File Id="QtRUTranslation" Source="translations/qt_ru.qm"/>
176178
<File Id="QtSKTranslation" Source="translations/qt_sk.qm"/>
177179
<File Id="QtUKTranslation" Source="translations/qt_uk.qm"/>
178180
<File Id="QtZHCNTranslation" Source="translations/qt_zh_CN.qm"/>
179181
<File Id="QtZHTWTranslation" Source="translations/qt_zh_TW.qm"/>
180182
</Component>
181183
</DirectoryRef>
182-
184+
183185
<Feature Id="Complete" Title="CuteMarkEd" Level="1">
184186
<ComponentRef Id="ProductComponent"/>
185187
<ComponentRef Id="Qt5Component"/>
186-
<ComponentRef Id="QtAccessiblityComponent"/>
187188
<ComponentRef Id="QtImageFormatsComponent"/>
188189
<ComponentRef Id="QtPlatformsComponent"/>
189190
<ComponentRef Id="QtPrintSupportComponent"/>
@@ -201,7 +202,7 @@
201202
<!-- Allow user to change the installation directory -->
202203
<Property Id="WIXUI_INSTALLDIR" Value="INSTALLDIR" />
203204
<UIRef Id="WixUI_InstallDir" />
204-
205+
205206
<!-- Skip license dialog -->
206207
<UI>
207208
<Publish Dialog="WelcomeDlg"
@@ -215,7 +216,7 @@
215216
Value="WelcomeDlg"
216217
Order="2">1</Publish>
217218
</UI>
218-
219+
219220
<Icon Id="CuteMarkEd.exe" SourceFile="cutemarked.exe"/>
220221
</Product>
221222
</Wix>

0 commit comments

Comments
 (0)