diff options
| author | Tim Jenssen <tim.jenssen@qt.io> | 2021-08-09 15:19:55 +0200 |
|---|---|---|
| committer | Tim Jenssen <tim.jenssen@qt.io> | 2021-08-09 14:56:30 +0000 |
| commit | 8d222e22d5cbb216852892dd59b8b58b3b909cdd (patch) | |
| tree | 75ecf227c04efbc912a01bbbe59880ad55d5b2b9 /scripts | |
| parent | 2c7b2ad6854a354aec5108ed4595369bca7f903a (diff) | |
deploy tls plugins to fix ssl downloads
it fixes https example downloads in QtDesignStudio
Change-Id: Ib162e630ae3a66691bec6d8f32cee241614e01e6
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/deployqt.py | 1 | ||||
| -rwxr-xr-x | scripts/deployqtHelper_mac.sh | 11 |
2 files changed, 12 insertions, 0 deletions
diff --git a/scripts/deployqt.py b/scripts/deployqt.py index ab105f308a..5ac56bedc3 100755 --- a/scripts/deployqt.py +++ b/scripts/deployqt.py @@ -390,6 +390,7 @@ def main(): 'wayland-decoration-client', 'wayland-graphics-integration-client', 'wayland-shell-integration', + 'tls' ] if common.is_windows_platform(): diff --git a/scripts/deployqtHelper_mac.sh b/scripts/deployqtHelper_mac.sh index 97cefee46b..815054b4e8 100755 --- a/scripts/deployqtHelper_mac.sh +++ b/scripts/deployqtHelper_mac.sh @@ -67,6 +67,17 @@ if [ -d "$assetimporterSrcDir" ]; then fi fi +# collect tls plugins to have ssl download feature available +tlsDestDir="$app_path/Contents/PlugIns/tls" +tlssrcDir="$plugin_src/tls" +if [ -d "$tlssrcDir" ]; then + if [ ! -d "$tlsDestDir" ]; then + echo "- Copying tls plugins to have ssl download feature available" + mkdir -p "$tlsDestDir" + find "$tlssrcDir" -iname "*.dylib" -maxdepth 1 -exec cp {} "$tlsDestDir"/ \; + fi +fi + # workaround for Qt 6.2: # - QTBUG-94796 macdeployqt does not deploy /Contents/PlugIns/sqldrivers/libqsqlite.dylib anymore sqldriversDestDir="$app_path/Contents/PlugIns/sqldrivers" |