summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRobert Griebl <robert.griebl@qt.io>2022-08-12 21:25:27 +0200
committerRobert Griebl <robert.griebl@qt.io>2022-08-16 12:40:17 +0200
commit4a40511f86e736d30117c22057312bdad58c1575 (patch)
treecdb67ea05ffa813fdae71fb447a3f0d5ea3c1b2e
parent520165d64c1a9db52fd8bf346d1d0487273feb68 (diff)
Add explicit include for std::abort (part 2)v5.15.10_QtAS-lts
Change-Id: I4d6bf4d4d29133202c0b7dfd088d09cf2a64d1c0 Reviewed-by: Dominik Holland <dominik.holland@qt.io> (cherry picked from commit 50255bf75103520c288f7ed31d2eddc22bcb18a1) Reviewed-by: Robert Griebl <robert.griebl@qt.io>
-rw-r--r--src/common-lib/crashhandler.cpp1
-rw-r--r--src/main-lib/main.cpp1
-rw-r--r--tests/qml/crash/apps/tld.test.crash/terminator2/qmlterminator2.cpp1
3 files changed, 3 insertions, 0 deletions
diff --git a/src/common-lib/crashhandler.cpp b/src/common-lib/crashhandler.cpp
index bcb73a27..1043de0c 100644
--- a/src/common-lib/crashhandler.cpp
+++ b/src/common-lib/crashhandler.cpp
@@ -311,6 +311,7 @@ QT_END_NAMESPACE_AM
# include <signal.h>
# include <pthread.h>
# include <stdio.h>
+# include <stdlib.h>
# if defined(AM_USE_LIBBACKTRACE)
# include <libbacktrace/backtrace.h>
diff --git a/src/main-lib/main.cpp b/src/main-lib/main.cpp
index 481bfb2c..f548b1d7 100644
--- a/src/main-lib/main.cpp
+++ b/src/main-lib/main.cpp
@@ -42,6 +42,7 @@
****************************************************************************/
#include <memory>
+#include <cstdlib>
#include <qglobal.h>
#if defined(QT_DBUS_LIB) && !defined(AM_DISABLE_EXTERNAL_DBUS_INTERFACES)
diff --git a/tests/qml/crash/apps/tld.test.crash/terminator2/qmlterminator2.cpp b/tests/qml/crash/apps/tld.test.crash/terminator2/qmlterminator2.cpp
index 6ad8e346..56a84a58 100644
--- a/tests/qml/crash/apps/tld.test.crash/terminator2/qmlterminator2.cpp
+++ b/tests/qml/crash/apps/tld.test.crash/terminator2/qmlterminator2.cpp
@@ -33,6 +33,7 @@
#include "qmlterminator2.h"
#include <signal.h>
+#include <stdlib.h>
static QObject *terminator_provider(QQmlEngine *engine, QJSEngine *scriptEngine)