Skip to content

Commit

Permalink
Merge pull request musescore#24371 from cbjeukendrup/vst_kontakt_qml_…
Browse files Browse the repository at this point in the history
…crash_again

Fix Kontakt crash because of conflicting QML files (again…)
  • Loading branch information
RomanPudashkin authored Sep 2, 2024
2 parents 01003e0 + c177e92 commit 7e34399
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 1 deletion.
1 change: 0 additions & 1 deletion SetupConfigure.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,6 @@ endif()
###########################################
if (OS_IS_MAC)
SET(Mscore_INSTALL_NAME "Contents/Resources/")
SET(Mscore_FRAMEWORKS_NAME "Frameworks/")
SET(Mscore_SHARE_NAME "mscore.app/")
elseif (OS_IS_WIN)
SET(Mscore_INSTALL_NAME "")
Expand Down
12 changes: 12 additions & 0 deletions buildscripts/packaging/macOS/package.sh
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,18 @@ macdeployqt ${VOLUME}/${APPNAME}.app -verbose=2 -qmldir=.
echo "otool -L post-macdeployqt"
otool -L ${VOLUME}/${APPNAME}.app/Contents/MacOS/mscore

# Remove dSYM files
echo "Remove dSYM files"
find ${VOLUME}/${APPNAME}.app/Contents -type d -name "*.dSYM" -exec rm -r {} +

# Rename Resources/qml to Resources/qml_mu. This way, VST3 plugins that also use QML
# won't find these QML files, to prevent crashes because of conflicts.
# https://github.com/musescore/MuseScore/issues/21372
# https://github.com/musescore/MuseScore/issues/24331
echo "Rename Resources/qml to Resources/qml_mu"
mv ${VOLUME}/${APPNAME}.app/Contents/Resources/qml ${VOLUME}/${APPNAME}.app/Contents/Resources/qml_mu
sed -i '' 's:Resources/qml:Resources/qml_mu:g' ${VOLUME}/${APPNAME}.app/Contents/Resources/qt.conf

echo "Rename ${APPNAME}.app to ${VOLUME}/${LONGER_NAME}.app"
mv ${VOLUME}/${APPNAME}.app "${VOLUME}/${LONGER_NAME}.app"

Expand Down

0 comments on commit 7e34399

Please sign in to comment.