feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

qmlpuppet: fix crashpad build

Browse Source 
Change-Id: I02f5abce80d4ccc1ea711e1dcb01946d53f8b5a7
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
This commit is contained in:
Tim Jenssen
2022-12-20 18:25:46 +01:00
parent d77cdc88d7
commit 74da3abb32
2 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/tools/qml2puppet/qml2puppet/runner/puppet/configcrashpad.h
View File

@@ -6,11 +6,6 @@
#include <windows.h> #include <windows.h>
#endif #endif
#define START_CRASHPAD
#if defined(ENABLE_CRASHPAD) && defined(Q_OS_WIN)
startCrashpad()
#endif
#ifdef ENABLE_QT_BREAKPAD #ifdef ENABLE_QT_BREAKPAD
#include <qtsystemexceptionhandler.h> #include <qtsystemexceptionhandler.h>
#endif #endif
@@ -63,6 +58,11 @@ namespace {
const QString libexecPath = QCoreApplication::applicationDirPath() + '/' const QString libexecPath = QCoreApplication::applicationDirPath() + '/'
+ RELATIVE_LIBEXEC_PATH; + RELATIVE_LIBEXEC_PATH;
QtSystemExceptionHandler systemExceptionHandler(libexecPath); QtSystemExceptionHandler systemExceptionHandler(libexecPath);
#endif #endif //#ifdef ENABLE_QT_BREAKPAD
#endif #else //#if defined(ENABLE_CRASHPAD) && defined(Q_OS_WIN)
bool startCrashpad()
{
return false;
}
#endif //#if defined(ENABLE_CRASHPAD) && defined(Q_OS_WIN)
} }

3
src/tools/qml2puppet/qml2puppet/runner/puppet/qmlpuppet.cpp
View File

@@ -114,7 +114,8 @@ void QmlPuppet::initQmlRunner()
Import3D::import3D(sourceAsset, outDir, options); Import3D::import3D(sourceAsset, outDir, options);
} }
START_CRASHPAD; startCrashpad();
new QmlDesigner::Qt5NodeInstanceClientProxy(m_coreApp.get()); new QmlDesigner::Qt5NodeInstanceClientProxy(m_coreApp.get());
#if defined(Q_OS_WIN) && defined(QT_NO_DEBUG) #if defined(Q_OS_WIN) && defined(QT_NO_DEBUG)