From 74da3abb326f2a83b1d94e4cca0b958aac54be62 Mon Sep 17 00:00:00 2001
From: Tim Jenssen <tim.jenssen@qt.io>
Date: Tue, 20 Dec 2022 18:25:46 +0100
Subject: [PATCH] qmlpuppet: fix crashpad build

Change-Id: I02f5abce80d4ccc1ea711e1dcb01946d53f8b5a7
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
---
 .../qml2puppet/runner/puppet/configcrashpad.h      | 14 +++++++-------
 .../qml2puppet/runner/puppet/qmlpuppet.cpp         |  3 ++-
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/src/tools/qml2puppet/qml2puppet/runner/puppet/configcrashpad.h b/src/tools/qml2puppet/qml2puppet/runner/puppet/configcrashpad.h
index 39b45e5f1c3..aec1cbdafad 100644
--- a/src/tools/qml2puppet/qml2puppet/runner/puppet/configcrashpad.h
+++ b/src/tools/qml2puppet/qml2puppet/runner/puppet/configcrashpad.h
@@ -6,11 +6,6 @@
 #include <windows.h>
 #endif
 
-#define START_CRASHPAD
-#if defined(ENABLE_CRASHPAD) && defined(Q_OS_WIN)
-startCrashpad()
-#endif
-
 #ifdef ENABLE_QT_BREAKPAD
 #include <qtsystemexceptionhandler.h>
 #endif
@@ -63,6 +58,11 @@ namespace {
     const QString libexecPath = QCoreApplication::applicationDirPath() + '/'
                                 + RELATIVE_LIBEXEC_PATH;
     QtSystemExceptionHandler systemExceptionHandler(libexecPath);
-#endif
-#endif
+#endif //#ifdef ENABLE_QT_BREAKPAD
+#else //#if defined(ENABLE_CRASHPAD) && defined(Q_OS_WIN)
+    bool startCrashpad()
+    {
+        return false;
+    }
+#endif //#if defined(ENABLE_CRASHPAD) && defined(Q_OS_WIN)
 }
diff --git a/src/tools/qml2puppet/qml2puppet/runner/puppet/qmlpuppet.cpp b/src/tools/qml2puppet/qml2puppet/runner/puppet/qmlpuppet.cpp
index d75bd6b542d..f87387290aa 100644
--- a/src/tools/qml2puppet/qml2puppet/runner/puppet/qmlpuppet.cpp
+++ b/src/tools/qml2puppet/qml2puppet/runner/puppet/qmlpuppet.cpp
@@ -114,7 +114,8 @@ void QmlPuppet::initQmlRunner()
         Import3D::import3D(sourceAsset, outDir, options);
     }
 
-    START_CRASHPAD;
+    startCrashpad();
+
     new QmlDesigner::Qt5NodeInstanceClientProxy(m_coreApp.get());
 
 #if defined(Q_OS_WIN) && defined(QT_NO_DEBUG)