feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

deploy tls plugins to fix ssl downloads

Browse Source 
it fixes https example downloads in QtDesignStudio

Change-Id: Ib162e630ae3a66691bec6d8f32cee241614e01e6
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
This commit is contained in:
Tim Jenssen
2021-08-09 15:19:55 +02:00
parent 2c7b2ad685
commit 8d222e22d5
2 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
scripts/deployqt.py
View File

@@ -390,6 +390,7 @@ def main():
'wayland-decoration-client', 'wayland-decoration-client',
'wayland-graphics-integration-client', 'wayland-graphics-integration-client',
'wayland-shell-integration', 'wayland-shell-integration',
'tls'
] ]
if common.is_windows_platform(): if common.is_windows_platform():

11
scripts/deployqtHelper_mac.sh
View File

@@ -67,6 +67,17 @@ if [ -d "$assetimporterSrcDir" ]; then
fi fi
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: # workaround for Qt 6.2:
# - QTBUG-94796 macdeployqt does not deploy /Contents/PlugIns/sqldrivers/libqsqlite.dylib anymore # - QTBUG-94796 macdeployqt does not deploy /Contents/PlugIns/sqldrivers/libqsqlite.dylib anymore
sqldriversDestDir="$app_path/Contents/PlugIns/sqldrivers" sqldriversDestDir="$app_path/Contents/PlugIns/sqldrivers"