diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2022-04-07 12:24:59 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2022-04-08 14:18:08 +0000 |
| commit | 81c1c63c1dac224bcc492b92958790884082e86b (patch) | |
| tree | a5cd7107fc9b2319f2441577afa69d9f57106ce5 /scripts | |
| parent | ec51347144903b7e675a01ba0af943b165414a4c (diff) | |
| download | qt-creator-81c1c63c1dac224bcc492b92958790884082e86b.tar.gz | |
macOS: Remove workarounds for Qt 6.2 betas
QTBUG-94796 is fixed, and macdeployqt copies all the plugins again.
Change-Id: I1f8201483e9cf4986eea0732d75d545425d3b5d6
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/deployqtHelper_mac.sh | 35 |
1 files changed, 0 insertions, 35 deletions
diff --git a/scripts/deployqtHelper_mac.sh b/scripts/deployqtHelper_mac.sh index e8f46032a4..8c380bc2a8 100755 --- a/scripts/deployqtHelper_mac.sh +++ b/scripts/deployqtHelper_mac.sh @@ -67,41 +67,6 @@ 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" -sqldriversSrcDir="$plugin_src/sqldrivers" -if [ -d "$sqldriversSrcDir" ]; then - if [ ! -d "$sqldriversDestDir" ]; then - echo "- Copying sqlitedriver plugin" - mkdir -p "$sqldriversDestDir" - cp "$sqldriversSrcDir/libqsqlite.dylib" "$sqldriversDestDir/libqsqlite.dylib" - fi -fi - -# workaround for Qt 6.2: -# - QTBUG-94796 macdeployqt does not deploy /Contents/PlugIns/imageformats/libqsvg.dylib anymore -imageformatsDestDir="$app_path/Contents/PlugIns/imageformats" -imageformatsSrcDir="$plugin_src/imageformats" -if [ -d "$imageformatsSrcDir" ]; then - if [ ! -d "$imageformatsDestDir" ]; then - echo "- Copying sqlitedriver plugin" - mkdir -p "$imageformatsDestDir" - cp "$imageformatsSrcDir/libqsvg.dylib" "$imageformatsDestDir/libqsvg.dylib" - fi -fi - # copy Qt Quick 2 imports imports2Dir="$app_path/Contents/Imports/qtquick2" if [ -d "$quick2_src" ]; then |