From ab16f2984b6661ea172d345b0ecc9a7ce33bf40c Mon Sep 17 00:00:00 2001 From: Eike Ziller Date: Mon, 4 Oct 2021 15:31:30 +0200 Subject: [PATCH] Work around QRegularExpression crashes on macOS with Rosetta MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Looks like the regular expression jitting is not reentrant when running under Rosetta for some reason. It was crashing when loading bigger subdir .pro files which regular expressions in it, like qtcreator.pro. Disable JIT if we run under Rosetta. Task-number: QTBUG-97085 Change-Id: Icbab1ca8f62afa9cc86045983e84087a7694b5ad Reviewed-by: Tor Arne Vestbø --- src/app/main.cpp | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/app/main.cpp b/src/app/main.cpp index d3946584e3c..c7270b3dec0 100644 --- a/src/app/main.cpp +++ b/src/app/main.cpp @@ -492,6 +492,11 @@ int main(int argc, char **argv) QApplication::setAttribute(Qt::AA_DontUseNativeMenuBar); } + if (Utils::HostOsInfo::isRunningUnderRosetta()) { + // work around QTBUG-97085: QRegularExpression jitting is not reentrant under Rosetta + qputenv("QT_ENABLE_REGEXP_JIT", "0"); + } + Utils::TemporaryDirectory::setMasterTemporaryDirectory(QDir::tempPath() + "/" + Core::Constants::IDE_CASED_ID + "-XXXXXX"); #ifdef Q_OS_MACOS