summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBernd Weimer <bernd.weimer@pelagicore.com>2020-02-26 18:18:08 +0100
committerBernd Weimer <bernd.weimer@pelagicore.com>2020-02-27 13:45:04 +0100
commit377b597e9f208c8ecd8feb731aea47adcbdecb52 (patch)
tree241850f53af95f74e70293aacb34186cdeaa56af
parent6a1553e451890580db06b2c2d4939203ac349f8b (diff)
Prevent QML backtrace when engine has been deleted
Change-Id: I0926e68e411c4285d70144b2db4b6a848b39a784 Reviewed-by: Robert Griebl <robert.griebl@qt.io>
-rw-r--r--src/common-lib/crashhandler.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/common-lib/crashhandler.cpp b/src/common-lib/crashhandler.cpp
index 250aaa05..da961fa1 100644
--- a/src/common-lib/crashhandler.cpp
+++ b/src/common-lib/crashhandler.cpp
@@ -87,6 +87,7 @@ static struct InitReaper
#else
#if defined(QT_QML_LIB)
+# include <QPointer>
# include <QQmlEngine>
# include <QtQml/private/qv4engine_p.h>
#endif
@@ -137,7 +138,7 @@ void CrashHandler::setCrashActionConfiguration(const QVariantMap &config)
}
#if defined(QT_QML_LIB)
-static QQmlEngine *qmlEngine;
+static QPointer<QQmlEngine> qmlEngine;
void CrashHandler::setQmlEngine(QQmlEngine *engine)
{