Merge remote-tracking branch 'origin/5.0' into 6.0

Change-Id: I311d1128c6a299c1db8717a12b40393055a889bb
This commit is contained in:
Eike Ziller
2021-10-05 09:13:56 +02:00
7 changed files with 29 additions and 7 deletions

View File

@@ -494,6 +494,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