forked from qt-creator/qt-creator
qmlpuppet: fix crashpad build
Change-Id: I02f5abce80d4ccc1ea711e1dcb01946d53f8b5a7 Reviewed-by: <github-actions-qt-creator@cristianadam.eu> Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
This commit is contained in:
@@ -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)
|
||||
}
|
||||
|
@@ -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)
|
||||
|
Reference in New Issue
Block a user