Skip to content

Fixed crash on macOS when JS code is JIT-compiled #4225

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

Fixed crash on macOS when JS code is JIT-compiled #4225

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions src/tiledapp/app.entitlements
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>com.apple.security.cs.allow-jit</key>
<true/>
</dict>
</plist>
7 changes: 7 additions & 0 deletions src/tiledapp/main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -422,6 +422,13 @@ int main(int argc, char *argv[])
}
#endif

// Disable JIT compilation in the Qt Quick V4 engine on macOS, since it
// triggers a crash in code-signed releases. This is resolved by adding the
// com.apple.security.cs.allow-jit entitlement since Qt 6.8.2.
#if defined(Q_OS_MAC) && !defined(QT_DEBUG) && QT_VERSION < QT_VERSION_CHECK(6, 8, 2)
qputenv("QV4_FORCE_INTERPRETER", "1");
#endif

QGuiApplication::setHighDpiScaleFactorRoundingPolicy(Qt::HighDpiScaleFactorRoundingPolicy::RoundPreferFloor);

// High-DPI scaling is always enabled in Qt 6
Expand Down
5 changes: 4 additions & 1 deletion src/tiledapp/tiledapp.qbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ TiledQtGuiApplication {

Depends { name: "libtilededitor" }
Depends { name: "ib"; condition: qbs.targetOS.contains("macos") }
Depends { name: "codesign"; condition: qbs.targetOS.contains("macos") }
Depends { name: "Qt.gui-private"; condition: qbs.targetOS.contains("windows") && Qt.core.versionMajor >= 6 }
Depends { name: "texttemplate"; condition: qbs.targetOS.contains("windows") }

Expand Down Expand Up @@ -43,6 +44,7 @@ TiledQtGuiApplication {
condition: qbs.targetOS.contains("macos")
cpp.frameworks: ["Foundation"]
bundle.identifierPrefix: "org.mapeditor"
codesign.teamIdentifier: "QL3K47J68L"
ib.appIconName: "tiled-icon-mac"
targetName: "Tiled"
}
Expand Down Expand Up @@ -72,10 +74,11 @@ TiledQtGuiApplication {
}

Group {
name: "macOS (Info.plist and icons)"
name: "macOS (Info.plist, icons and entitlements)"
condition: qbs.targetOS.contains("macos")
files: [
"Info.plist",
"app.entitlements",
"images/tiled.xcassets",
]
}
Expand Down
Loading