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 #endif -#define START_CRASHPAD -#if defined(ENABLE_CRASHPAD) && defined(Q_OS_WIN) -startCrashpad() -#endif - #ifdef ENABLE_QT_BREAKPAD #include #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)