Skip to content

Commit 7e34399

Browse files
Merge pull request musescore#24371 from cbjeukendrup/vst_kontakt_qml_crash_again
Fix Kontakt crash because of conflicting QML files (again…)
2 parents 01003e0 + c177e92 commit 7e34399

File tree

2 files changed

+12
-1
lines changed

2 files changed

+12
-1
lines changed

SetupConfigure.cmake

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,6 @@ endif()
7373
###########################################
7474
if (OS_IS_MAC)
7575
SET(Mscore_INSTALL_NAME "Contents/Resources/")
76-
SET(Mscore_FRAMEWORKS_NAME "Frameworks/")
7776
SET(Mscore_SHARE_NAME "mscore.app/")
7877
elseif (OS_IS_WIN)
7978
SET(Mscore_INSTALL_NAME "")

buildscripts/packaging/macOS/package.sh

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,18 @@ macdeployqt ${VOLUME}/${APPNAME}.app -verbose=2 -qmldir=.
6060
echo "otool -L post-macdeployqt"
6161
otool -L ${VOLUME}/${APPNAME}.app/Contents/MacOS/mscore
6262

63+
# Remove dSYM files
64+
echo "Remove dSYM files"
65+
find ${VOLUME}/${APPNAME}.app/Contents -type d -name "*.dSYM" -exec rm -r {} +
66+
67+
# Rename Resources/qml to Resources/qml_mu. This way, VST3 plugins that also use QML
68+
# won't find these QML files, to prevent crashes because of conflicts.
69+
# https://github.com/musescore/MuseScore/issues/21372
70+
# https://github.com/musescore/MuseScore/issues/24331
71+
echo "Rename Resources/qml to Resources/qml_mu"
72+
mv ${VOLUME}/${APPNAME}.app/Contents/Resources/qml ${VOLUME}/${APPNAME}.app/Contents/Resources/qml_mu
73+
sed -i '' 's:Resources/qml:Resources/qml_mu:g' ${VOLUME}/${APPNAME}.app/Contents/Resources/qt.conf
74+
6375
echo "Rename ${APPNAME}.app to ${VOLUME}/${LONGER_NAME}.app"
6476
mv ${VOLUME}/${APPNAME}.app "${VOLUME}/${LONGER_NAME}.app"
6577

0 commit comments

Comments
 (0)