From 01b71195f06e6dc45664c27b171a22ccf8b48070 Mon Sep 17 00:00:00 2001
From: Tim Jenssen <tim.jenssen@qt.io>
Date: Wed, 21 Dec 2022 11:53:48 +0100
Subject: [PATCH] qmlpuppet: fix include if crashpad is enabled

#include <windows.h> should come after #define NOMINMAX
not sure why it was necessary as an explicit include
it should come by the crashpad includes

Change-Id: I53ccdd893e9d8e5d5fadd46f5a5f5c0c21af0cc5
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
---
 src/tools/qml2puppet/qml2puppet/configcrashpad.h |  4 +---
 src/tools/qml2puppet/qml2puppet/qmlpuppet.cpp    | 11 +++++------
 2 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/src/tools/qml2puppet/qml2puppet/configcrashpad.h b/src/tools/qml2puppet/qml2puppet/configcrashpad.h
index aec1cbdafad..7b663b84498 100644
--- a/src/tools/qml2puppet/qml2puppet/configcrashpad.h
+++ b/src/tools/qml2puppet/qml2puppet/configcrashpad.h
@@ -2,9 +2,7 @@
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0 WITH Qt-GPL-exception-1.0
 #pragma once
 
-#ifdef Q_OS_WIN
-#include <windows.h>
-#endif
+#include <QtGlobal>
 
 #ifdef ENABLE_QT_BREAKPAD
 #include <qtsystemexceptionhandler.h>
diff --git a/src/tools/qml2puppet/qml2puppet/qmlpuppet.cpp b/src/tools/qml2puppet/qml2puppet/qmlpuppet.cpp
index f87387290aa..a004a604584 100644
--- a/src/tools/qml2puppet/qml2puppet/qmlpuppet.cpp
+++ b/src/tools/qml2puppet/qml2puppet/qmlpuppet.cpp
@@ -2,22 +2,21 @@
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0 WITH Qt-GPL-exception-1.0
 
 #include "qmlpuppet.h"
+#include "configcrashpad.h"
 
 #ifdef MULTILANGUAGE_TRANSLATIONPROVIDER
 #include <sqlitelibraryinitializer.h>
 #endif
 
-#include <QFileInfo>
-#include <QQmlComponent>
-#include <QQmlEngine>
-
 #include <qml2puppet/iconrenderer/iconrenderer.h>
 #include <qml2puppet/import3d/import3d.h>
 
-#include "configcrashpad.h"
-
 #include <qt5nodeinstanceclientproxy.h>
 
+#include <QFileInfo>
+#include <QQmlComponent>
+#include <QQmlEngine>
+
 void QmlPuppet::initCoreApp()
 {
     // Since we always render text into an FBO, we need to globally disable