Skip to content

Commit

Permalink
Initial attempt to get our Win64 builds working with Qt 5.12.5
Browse files Browse the repository at this point in the history
  • Loading branch information
justinclift committed Oct 10, 2019
1 parent 6bd176a commit bf62a6e
Showing 1 changed file with 26 additions and 20 deletions.
46 changes: 26 additions & 20 deletions installer/windows/translations.wxs
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,19 @@

<Directory Id="translations" Name="translations">

<!-- These files are not present in Qt 5.12, used by our 64-bit nightly builds. -->
<?if $(sys.BUILDARCH)="x32"?>
<Component><File Source="$(var.QtPath)\translations\qtquick1_cs.qm" /></Component>
<Component><File Source="$(var.QtPath)\translations\qtquick1_en.qm" /></Component>
<Component><File Source="$(var.QtPath)\translations\qtquick1_fr.qm" /></Component>
<Component><File Source="$(var.QtPath)\translations\qtquick1_de.qm" /></Component>
<Component><File Source="$(var.QtPath)\translations\qtquick1_it.qm" /></Component>
<Component><File Source="$(var.QtPath)\translations\qtquick1_ko.qm" /></Component>
<Component><File Source="$(var.QtPath)\translations\qtquick1_pl.qm" /></Component>
<Component><File Source="$(var.QtPath)\translations\qtquick1_ru.qm" /></Component>
<Component><File Source="$(var.QtPath)\translations\qtquick1_uk.qm" /></Component>
<?endif?>

<!-- Arabic -->
<Component><File Source="$(var.QtPath)\translations\qt_ar.qm" /></Component>
<!-- These files are not present in Qt 5.7, used by our 32-bit nightly builds. -->
Expand All @@ -48,55 +61,48 @@
<Component><File Source="$(var.QtPath)\translations\qt_cs.qm" /></Component>
<Component><File Source="$(var.QtPath)\translations\qtbase_cs.qm" /></Component>
<Component><File Source="$(var.QtPath)\translations\qtmultimedia_cs.qm" /></Component>
<Component><File Source="$(var.QtPath)\translations\qtquick1_cs.qm" /></Component>
<Component><File Source="$(var.QtPath)\translations\qtscript_cs.qm" /></Component>
<Component><File Source="$(var.QtPath)\translations\qtxmlpatterns_cs.qm" /></Component>

<!-- English (United Kingdom) -->
<Component><File Source="$(var.QtPath)\translations\qt_en.qm" /></Component>
<Component><File Source="$(var.QtPath)\translations\qtbase_en.qm" /></Component>
<Component><File Source="$(var.QtPath)\translations\qtmultimedia_en.qm" /></Component>
<Component><File Source="$(var.QtPath)\translations\qtquick1_en.qm" /></Component>
<Component><File Source="$(var.QtPath)\translations\qtscript_en.qm" /></Component>
<Component><File Source="$(var.QtPath)\translations\qtxmlpatterns_en.qm" /></Component>

<!-- French -->
<Component><File Source="$(var.QtPath)\translations\qt_fr.qm" /></Component>
<Component><File Source="$(var.QtPath)\translations\qtbase_fr.qm" /></Component>
<Component><File Source="$(var.QtPath)\translations\qtmultimedia_fr.qm" /></Component>
<Component><File Source="$(var.QtPath)\translations\qtquick1_fr.qm" /></Component>
<Component><File Source="$(var.QtPath)\translations\qtscript_fr.qm" /></Component>
<Component><File Source="$(var.QtPath)\translations\qtxmlpatterns_fr.qm" /></Component>

<!-- German -->
<Component><File Source="$(var.QtPath)\translations\qt_de.qm" /></Component>
<Component><File Source="$(var.QtPath)\translations\qtbase_de.qm" /></Component>
<Component><File Source="$(var.QtPath)\translations\qtmultimedia_de.qm" /></Component>
<Component><File Source="$(var.QtPath)\translations\qtquick1_de.qm" /></Component>
<Component><File Source="$(var.QtPath)\translations\qtscript_de.qm" /></Component>
<Component><File Source="$(var.QtPath)\translations\qtxmlpatterns_de.qm" /></Component>

<!-- Italian -->
<Component><File Source="$(var.QtPath)\translations\qt_it.qm" /></Component>
<Component><File Source="$(var.QtPath)\translations\qtbase_it.qm" /></Component>
<Component><File Source="$(var.QtPath)\translations\qtmultimedia_it.qm" /></Component>
<Component><File Source="$(var.QtPath)\translations\qtquick1_it.qm" /></Component>
<Component><File Source="$(var.QtPath)\translations\qtscript_it.qm" /></Component>
<Component><File Source="$(var.QtPath)\translations\qtxmlpatterns_it.qm" /></Component>

<!-- Korean -->
<Component><File Source="$(var.QtPath)\translations\qt_ko.qm" /></Component>
<Component><File Source="$(var.QtPath)\translations\qtbase_ko.qm" /></Component>
<Component><File Source="$(var.QtPath)\translations\qtmultimedia_ko.qm" /></Component>
<Component><File Source="$(var.QtPath)\translations\qtquick1_ko.qm" /></Component>
<Component><File Source="$(var.QtPath)\translations\qtscript_ko.qm" /></Component>
<Component><File Source="$(var.QtPath)\translations\qtxmlpatterns_ko.qm" /></Component>

<!-- Polish -->
<Component><File Source="$(var.QtPath)\translations\qt_pl.qm" /></Component>
<Component><File Source="$(var.QtPath)\translations\qtbase_pl.qm" /></Component>
<Component><File Source="$(var.QtPath)\translations\qtmultimedia_pl.qm" /></Component>
<Component><File Source="$(var.QtPath)\translations\qtquick1_pl.qm" /></Component>
<Component><File Source="$(var.QtPath)\translations\qtscript_pl.qm" /></Component>
<Component><File Source="$(var.QtPath)\translations\qtxmlpatterns_pl.qm" /></Component>

Expand All @@ -107,7 +113,6 @@
<Component><File Source="$(var.QtPath)\translations\qt_ru.qm" /></Component>
<Component><File Source="$(var.QtPath)\translations\qtbase_ru.qm" /></Component>
<Component><File Source="$(var.QtPath)\translations\qtmultimedia_ru.qm" /></Component>
<Component><File Source="$(var.QtPath)\translations\qtquick1_ru.qm" /></Component>
<Component><File Source="$(var.QtPath)\translations\qtscript_ru.qm" /></Component>
<Component><File Source="$(var.QtPath)\translations\qtxmlpatterns_ru.qm" /></Component>

Expand All @@ -117,7 +122,6 @@
<?if $(sys.BUILDARCH)="x64"?>
<Component><File Source="$(var.QtPath)\translations\qtbase_es.qm" /></Component>
<Component><File Source="$(var.QtPath)\translations\qtmultimedia_es.qm" /></Component>
<Component><File Source="$(var.QtPath)\translations\qtquick1_es.qm" /></Component>
<Component><File Source="$(var.QtPath)\translations\qtscript_es.qm" /></Component>
<Component><File Source="$(var.QtPath)\translations\qtxmlpatterns_es.qm" /></Component>
<?endif?>
Expand All @@ -128,7 +132,6 @@
<Component><File Source="$(var.QtPath)\translations\qt_uk.qm" /></Component>
<Component><File Source="$(var.QtPath)\translations\qtbase_uk.qm" /></Component>
<Component><File Source="$(var.QtPath)\translations\qtmultimedia_uk.qm" /></Component>
<Component><File Source="$(var.QtPath)\translations\qtquick1_uk.qm" /></Component>
<Component><File Source="$(var.QtPath)\translations\qtscript_uk.qm" /></Component>
<Component><File Source="$(var.QtPath)\translations\qtxmlpatterns_uk.qm" /></Component>

Expand All @@ -138,6 +141,19 @@

<ComponentGroup Id="TranslationsGroup">

<!-- These files are not present in Qt 5.12, used by our 64-bit nightly builds. -->
<?if $(sys.BUILDARCH)!="x64"?>
<ComponentRef Id="qtquick1_cs.qm" />
<ComponentRef Id="qtquick1_en.qm" />
<ComponentRef Id="qtquick1_fr.qm" />
<ComponentRef Id="qtquick1_de.qm" />
<ComponentRef Id="qtquick1_it.qm" />
<ComponentRef Id="qtquick1_ko.qm" />
<ComponentRef Id="qtquick1_pl.qm" />
<ComponentRef Id="qtquick1_ru.qm" />
<ComponentRef Id="qtquick1_uk.qm" />
<?endif?>

<!-- Arabic -->
<ComponentRef Id="qt_ar.qm" />
<!-- These files are not present in Qt 5.7, used by our 32-bit nightly builds. -->
Expand All @@ -157,55 +173,48 @@
<ComponentRef Id="qt_cs.qm" />
<ComponentRef Id="qtbase_cs.qm" />
<ComponentRef Id="qtmultimedia_cs.qm" />
<ComponentRef Id="qtquick1_cs.qm" />
<ComponentRef Id="qtscript_cs.qm" />
<ComponentRef Id="qtxmlpatterns_cs.qm" />

<!-- English (United Kingdom) -->
<ComponentRef Id="qt_en.qm" />
<ComponentRef Id="qtbase_en.qm" />
<ComponentRef Id="qtmultimedia_en.qm" />
<ComponentRef Id="qtquick1_en.qm" />
<ComponentRef Id="qtscript_en.qm" />
<ComponentRef Id="qtxmlpatterns_en.qm" />

<!-- French -->
<ComponentRef Id="qt_fr.qm" />
<ComponentRef Id="qtbase_fr.qm" />
<ComponentRef Id="qtmultimedia_fr.qm" />
<ComponentRef Id="qtquick1_fr.qm" />
<ComponentRef Id="qtscript_fr.qm" />
<ComponentRef Id="qtxmlpatterns_fr.qm" />

<!-- German -->
<ComponentRef Id="qt_de.qm" />
<ComponentRef Id="qtbase_de.qm" />
<ComponentRef Id="qtmultimedia_de.qm" />
<ComponentRef Id="qtquick1_de.qm" />
<ComponentRef Id="qtscript_de.qm" />
<ComponentRef Id="qtxmlpatterns_de.qm" />

<!-- Italian -->
<ComponentRef Id="qt_it.qm" />
<ComponentRef Id="qtbase_it.qm" />
<ComponentRef Id="qtmultimedia_it.qm" />
<ComponentRef Id="qtquick1_it.qm" />
<ComponentRef Id="qtscript_it.qm" />
<ComponentRef Id="qtxmlpatterns_it.qm" />

<!-- Korean -->
<ComponentRef Id="qt_ko.qm" />
<ComponentRef Id="qtbase_ko.qm" />
<ComponentRef Id="qtmultimedia_ko.qm" />
<ComponentRef Id="qtquick1_ko.qm" />
<ComponentRef Id="qtscript_ko.qm" />
<ComponentRef Id="qtxmlpatterns_ko.qm" />

<!-- Polish -->
<ComponentRef Id="qt_pl.qm" />
<ComponentRef Id="qtbase_pl.qm" />
<ComponentRef Id="qtmultimedia_pl.qm" />
<ComponentRef Id="qtquick1_pl.qm" />
<ComponentRef Id="qtscript_pl.qm" />
<ComponentRef Id="qtxmlpatterns_pl.qm" />

Expand All @@ -216,7 +225,6 @@
<ComponentRef Id="qt_ru.qm" />
<ComponentRef Id="qtbase_ru.qm" />
<ComponentRef Id="qtmultimedia_ru.qm" />
<ComponentRef Id="qtquick1_ru.qm" />
<ComponentRef Id="qtscript_ru.qm" />
<ComponentRef Id="qtxmlpatterns_ru.qm" />

Expand All @@ -226,7 +234,6 @@
<?if $(sys.BUILDARCH)="x64"?>
<ComponentRef Id="qtbase_es.qm" />
<ComponentRef Id="qtmultimedia_es.qm" />
<ComponentRef Id="qtquick1_es.qm" />
<ComponentRef Id="qtscript_es.qm" />
<ComponentRef Id="qtxmlpatterns_es.qm" />
<?endif?>
Expand All @@ -237,7 +244,6 @@
<ComponentRef Id="qt_uk.qm" />
<ComponentRef Id="qtbase_uk.qm" />
<ComponentRef Id="qtmultimedia_uk.qm" />
<ComponentRef Id="qtquick1_uk.qm" />
<ComponentRef Id="qtscript_uk.qm" />
<ComponentRef Id="qtxmlpatterns_uk.qm" />

Expand Down

0 comments on commit bf62a6e

Please sign in to comment.