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

macOS: Remove workarounds for Qt 6.2 betas

Browse Source 
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>
This commit is contained in:
Eike Ziller
2022-04-07 12:24:59 +02:00
parent ec51347144
commit 81c1c63c1d
1 changed files with 0 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
scripts/deployqtHelper_mac.sh
-35
View File
@@ -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