mirror of
https://github.com/transmission/transmission
synced 2024-12-22 07:42:37 +00:00
Include SVG support in Windows builds
This commit is contained in:
parent
bfbca961d4
commit
89b0362bf2
3 changed files with 18 additions and 5 deletions
12
dist/msi/components/QtClient.wxs
vendored
12
dist/msi/components/QtClient.wxs
vendored
|
@ -97,6 +97,9 @@
|
|||
<Component Id="dll.qt.network">
|
||||
<File DiskId="1" KeyPath="yes" Name="Qt$(var.QtMajorVer)Network.dll" />
|
||||
</Component>
|
||||
<Component Id="dll.qt.svg">
|
||||
<File DiskId="1" KeyPath="yes" Name="Qt$(var.QtMajorVer)Svg.dll" />
|
||||
</Component>
|
||||
<Component Id="dll.qt.widgets">
|
||||
<File DiskId="1" KeyPath="yes" Name="Qt$(var.QtMajorVer)Widgets.dll" />
|
||||
</Component>
|
||||
|
@ -109,7 +112,6 @@
|
|||
</DirectoryRef>
|
||||
<DirectoryRef Id="INSTALLDIR" FileSource="$(var.QtDir)\plugins">
|
||||
|
||||
<?if $(var.QtMajorVer) = 6 ?>
|
||||
<Directory Id="QTIMAGEFORMATSDIR" Name="imageformats">
|
||||
<Component Id="dll.qt.plugins.imageformats.gif">
|
||||
<File DiskId="1" KeyPath="yes" Name="qgif.dll" />
|
||||
|
@ -120,8 +122,10 @@
|
|||
<Component Id="dll.qt.plugins.imageformats.jpeg">
|
||||
<File DiskId="1" KeyPath="yes" Name="qjpeg.dll" />
|
||||
</Component>
|
||||
<Component Id="dll.qt.plugins.imageformats.svg">
|
||||
<File DiskId="1" KeyPath="yes" Name="qsvg.dll" />
|
||||
</Component>
|
||||
</Directory>
|
||||
<?endif ?>
|
||||
|
||||
<Directory Id="QTPLATFORMDIR" Name="platforms">
|
||||
<Component Id="dll.qt.plugins.platforms.windows">
|
||||
|
@ -161,15 +165,15 @@
|
|||
<ComponentRef Id="dll.qt.dbus" />
|
||||
<ComponentRef Id="dll.qt.gui" />
|
||||
<ComponentRef Id="dll.qt.network" />
|
||||
<ComponentRef Id="dll.qt.svg" />
|
||||
<ComponentRef Id="dll.qt.widgets" />
|
||||
<?if $(var.QtMajorVer) = 5 ?>
|
||||
<ComponentRef Id="dll.qt.winextras" />
|
||||
<?endif ?>
|
||||
<?if $(var.QtMajorVer) = 6 ?>
|
||||
<ComponentRef Id="dll.qt.plugins.imageformats.gif" />
|
||||
<ComponentRef Id="dll.qt.plugins.imageformats.ico" />
|
||||
<ComponentRef Id="dll.qt.plugins.imageformats.jpeg" />
|
||||
<?endif ?>
|
||||
<ComponentRef Id="dll.qt.plugins.imageformats.svg" />
|
||||
<ComponentRef Id="dll.qt.plugins.platforms.windows" />
|
||||
<ComponentRef Id="dll.qt.plugins.styles.windowsvista" />
|
||||
<?if $(var.QtMajorVer) = 6 ?>
|
||||
|
|
|
@ -16,6 +16,7 @@ function global:Build-Qt([string] $PrefixDir, [string] $Arch, [string] $DepsPref
|
|||
$UnpackFlags = @(
|
||||
(Join-Path $ArchiveBase qtactiveqt '*')
|
||||
(Join-Path $ArchiveBase qtbase '*')
|
||||
(Join-Path $ArchiveBase qtsvg '*')
|
||||
(Join-Path $ArchiveBase qttools '*')
|
||||
(Join-Path $ArchiveBase qttranslations '*')
|
||||
(Join-Path $ArchiveBase qtwinextras '*')
|
||||
|
|
|
@ -36,13 +36,21 @@ function global:Build-Transmission([string] $PrefixDir, [string] $Arch, [string]
|
|||
Copy-Item -Path (Join-Path $DepsPrefixDir bin "${x}.pdb") -Destination $DebugSymbolsDir
|
||||
}
|
||||
|
||||
foreach ($x in @('Core', 'DBus', 'Gui', 'Network', 'Widgets', 'WinExtras')) {
|
||||
foreach ($x in @('Core', 'DBus', 'Gui', 'Network', 'Svg', 'Widgets', 'WinExtras')) {
|
||||
if ($DepsPrefixDir -ne $PrefixDir) {
|
||||
Copy-Item -Path (Join-Path $DepsPrefixDir bin "Qt5${x}.dll") -Destination (Join-Path $PrefixDir bin)
|
||||
}
|
||||
Copy-Item -Path (Join-Path $DepsPrefixDir bin "Qt5${x}.pdb") -Destination $DebugSymbolsDir
|
||||
}
|
||||
|
||||
foreach ($x in @('gif', 'ico', 'jpeg', 'svg')) {
|
||||
if ($DepsPrefixDir -ne $PrefixDir) {
|
||||
New-Item -Path (Join-Path $PrefixDir plugins imageformats) -ItemType Directory -ErrorAction Ignore | Out-Null
|
||||
Copy-Item -Path (Join-Path $DepsPrefixDir plugins imageformats "q${x}.dll") -Destination (Join-Path $PrefixDir plugins imageformats)
|
||||
}
|
||||
Copy-Item -Path (Join-Path $DepsPrefixDir plugins imageformats "q${x}.pdb") -Destination $DebugSymbolsDir
|
||||
}
|
||||
|
||||
if ($DepsPrefixDir -ne $PrefixDir) {
|
||||
New-Item -Path (Join-Path $PrefixDir plugins platforms) -ItemType Directory -ErrorAction Ignore | Out-Null
|
||||
Copy-Item -Path (Join-Path $DepsPrefixDir plugins platforms qwindows.dll) -Destination (Join-Path $PrefixDir plugins platforms)
|
||||
|
|
Loading…
Reference in a new issue