forked from qt-creator/qt-creator
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>
This commit is contained in:
@@ -2,9 +2,7 @@
|
|||||||
// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0 WITH Qt-GPL-exception-1.0
|
// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0 WITH Qt-GPL-exception-1.0
|
||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#ifdef Q_OS_WIN
|
#include <QtGlobal>
|
||||||
#include <windows.h>
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifdef ENABLE_QT_BREAKPAD
|
#ifdef ENABLE_QT_BREAKPAD
|
||||||
#include <qtsystemexceptionhandler.h>
|
#include <qtsystemexceptionhandler.h>
|
||||||
|
@@ -2,22 +2,21 @@
|
|||||||
// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0 WITH Qt-GPL-exception-1.0
|
// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0 WITH Qt-GPL-exception-1.0
|
||||||
|
|
||||||
#include "qmlpuppet.h"
|
#include "qmlpuppet.h"
|
||||||
|
#include "configcrashpad.h"
|
||||||
|
|
||||||
#ifdef MULTILANGUAGE_TRANSLATIONPROVIDER
|
#ifdef MULTILANGUAGE_TRANSLATIONPROVIDER
|
||||||
#include <sqlitelibraryinitializer.h>
|
#include <sqlitelibraryinitializer.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include <QFileInfo>
|
|
||||||
#include <QQmlComponent>
|
|
||||||
#include <QQmlEngine>
|
|
||||||
|
|
||||||
#include <qml2puppet/iconrenderer/iconrenderer.h>
|
#include <qml2puppet/iconrenderer/iconrenderer.h>
|
||||||
#include <qml2puppet/import3d/import3d.h>
|
#include <qml2puppet/import3d/import3d.h>
|
||||||
|
|
||||||
#include "configcrashpad.h"
|
|
||||||
|
|
||||||
#include <qt5nodeinstanceclientproxy.h>
|
#include <qt5nodeinstanceclientproxy.h>
|
||||||
|
|
||||||
|
#include <QFileInfo>
|
||||||
|
#include <QQmlComponent>
|
||||||
|
#include <QQmlEngine>
|
||||||
|
|
||||||
void QmlPuppet::initCoreApp()
|
void QmlPuppet::initCoreApp()
|
||||||
{
|
{
|
||||||
// Since we always render text into an FBO, we need to globally disable
|
// Since we always render text into an FBO, we need to globally disable
|
||||||
|
Reference in New Issue
Block a user