From b58c57fb3f73c12ec216d80f06776901bc2da3db Mon Sep 17 00:00:00 2001
From: Tim Jenssen <tim.jenssen@qt.io>
Date: Thu, 24 Feb 2022 16:37:56 +0100
Subject: crashpad: disable calling crashpad_handler on arm64

Currently, the none arm handler binary is hanging and
needs further investigation.
Maybe a complete universal build will fix this, and
we can enable it again.

Change-Id: I60b5623d8dda500a3be3efd095f91a9609600324
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
---
 src/app/main.cpp | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/app/main.cpp b/src/app/main.cpp
index a4ef3eea32..e17ef27e20 100644
--- a/src/app/main.cpp
+++ b/src/app/main.cpp
@@ -56,6 +56,8 @@
 #include <QUrl>
 #include <QVariant>
 
+#include <QSysInfo>
+
 #include <QNetworkProxyFactory>
 
 #include <QApplication>
@@ -410,6 +412,11 @@ 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
-- 
cgit v1.2.1