From 3a46a5916548b6e5a8bce58ae2e589be238c8fab Mon Sep 17 00:00:00 2001 From: Robert Griebl Date: Fri, 12 Aug 2022 21:25:27 +0200 Subject: Add explicit include for std::abort (part 2) Change-Id: I4d6bf4d4d29133202c0b7dfd088d09cf2a64d1c0 Reviewed-by: Dominik Holland (cherry picked from commit 50255bf75103520c288f7ed31d2eddc22bcb18a1) Reviewed-by: Qt Cherry-pick Bot --- src/common-lib/crashhandler.cpp | 1 + src/main-lib/main.cpp | 1 + tests/auto/qml/crash/qmlcrash/qmlcrash.cpp | 1 + 3 files changed, 3 insertions(+) diff --git a/src/common-lib/crashhandler.cpp b/src/common-lib/crashhandler.cpp index 6c248d81..1e3389cc 100644 --- a/src/common-lib/crashhandler.cpp +++ b/src/common-lib/crashhandler.cpp @@ -284,6 +284,7 @@ QT_END_NAMESPACE_AM # include # include # include +# include # if defined(AM_USE_LIBBACKTRACE) # include diff --git a/src/main-lib/main.cpp b/src/main-lib/main.cpp index 437753b6..80b96751 100644 --- a/src/main-lib/main.cpp +++ b/src/main-lib/main.cpp @@ -4,6 +4,7 @@ // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only #include +#include #include #if defined(QT_DBUS_LIB) && !defined(AM_DISABLE_EXTERNAL_DBUS_INTERFACES) diff --git a/tests/auto/qml/crash/qmlcrash/qmlcrash.cpp b/tests/auto/qml/crash/qmlcrash/qmlcrash.cpp index 117bdbc3..19ad337a 100644 --- a/tests/auto/qml/crash/qmlcrash/qmlcrash.cpp +++ b/tests/auto/qml/crash/qmlcrash/qmlcrash.cpp @@ -9,6 +9,7 @@ #include "qmlcrash.h" #include +#include static QObject *qmlCrash_provider(QQmlEngine *engine, QJSEngine *scriptEngine) -- cgit v1.2.1