diff options
| author | Robert Schumacher <roschuma@microsoft.com> | 2018-01-26 11:09:52 -0800 |
|---|---|---|
| committer | Robert Schumacher <roschuma@microsoft.com> | 2018-01-29 16:08:45 -0800 |
| commit | b2eb87dc71c9df22d5c9fb5c2136786489b03196 (patch) | |
| tree | 86691381a0ef22adc5242aa36247c07e18d8a056 | |
| parent | 92f9f63df688cd238bccfc8404d242aadd00c1d7 (diff) | |
| download | vcpkg-b2eb87dc71c9df22d5c9fb5c2136786489b03196.tar.gz vcpkg-b2eb87dc71c9df22d5c9fb5c2136786489b03196.zip | |
[qt5-base] Add openssl dependency for Network module and deploy it for applications
| -rw-r--r-- | ports/qt5-base/CONTROL | 4 | ||||
| -rw-r--r-- | ports/qt5-base/qtdeploy.ps1 | 8 |
2 files changed, 10 insertions, 2 deletions
diff --git a/ports/qt5-base/CONTROL b/ports/qt5-base/CONTROL index 0886bd04f..619b9f577 100644 --- a/ports/qt5-base/CONTROL +++ b/ports/qt5-base/CONTROL @@ -1,4 +1,4 @@ Source: qt5-base -Version: 5.9.2-2 +Version: 5.9.2-3 Description: Qt5 Application Framework Base Module. Includes Core, GUI, Widgets, Networking, SQL, Concurrent and other essential qt components. -Build-Depends: zlib, libjpeg-turbo, libpng, freetype, pcre2, harfbuzz, sqlite3, libpq, double-conversion +Build-Depends: zlib, libjpeg-turbo, libpng, freetype, pcre2, harfbuzz, sqlite3, libpq, double-conversion, openssl diff --git a/ports/qt5-base/qtdeploy.ps1 b/ports/qt5-base/qtdeploy.ps1 index 9d514e411..b25a46e7a 100644 --- a/ports/qt5-base/qtdeploy.ps1 +++ b/ports/qt5-base/qtdeploy.ps1 @@ -10,6 +10,9 @@ # Note: this function signature and behavior is depended upon by applocal.ps1 function deployPluginsIfQt([string]$targetBinaryDir, [string]$QtPluginsDir, [string]$targetBinaryName) { + $baseDir = Split-Path $QtPluginsDir -parent + $binDir = "$baseDir\bin" + function deployPlugins([string]$pluginSubdirName) { if (Test-Path "$QtPluginsDir\$pluginSubdirName") { Write-Verbose " Deploying plugins directory '$pluginSubdirName'" @@ -36,6 +39,11 @@ function deployPluginsIfQt([string]$targetBinaryDir, [string]$QtPluginsDir, [str deployPlugins "platforminputcontexts" } elseif ($targetBinaryName -like "Qt5Network*.dll") { deployPlugins "bearer" + if (Test-Path "$binDir\libeay32.dll") + { + deployBinary "$targetBinaryDir" "$binDir" "libeay32.dll" + deployBinary "$targetBinaryDir" "$binDir" "ssleay32.dll" + } } elseif ($targetBinaryName -like "Qt5Sql*.dll") { deployPlugins "sqldrivers" } elseif ($targetBinaryName -like "Qt5Multimedia*.dll") { |