Merge remote-tracking branch 'origin/7.0'

Conflicts:
	src/plugins/qmlprojectmanager/qmlprojectplugin.cpp

Change-Id: I14030f58303839e706af892dd12a67566e3bed68
This commit is contained in:
Eike Ziller
2022-05-18 13:07:59 +02:00
89 changed files with 2011 additions and 791 deletions

View File

@@ -406,11 +406,6 @@ QStringList lastSessionArgument()
#ifdef ENABLE_CRASHPAD
bool startCrashpad(const QString &libexecPath, bool crashReportingEnabled)
{
if (QSysInfo::currentCpuArchitecture() == "arm64") {
qDebug() << "The crashpad_handler binary does not work on arm64 properly. So it is disabled for now.";
return false;
}
using namespace crashpad;
// Cache directory that will store crashpad information and minidumps