diff options
| author | Thiago Macieira <thiago.macieira@intel.com> | 2024-12-21 12:08:32 -0300 |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@intel.com> | 2024-12-26 08:34:38 -0300 |
| commit | b8f84fd1e2af38ece89d60619bf93e7af34433ab (patch) | |
| tree | 86258cbb7e6570d178d6965ae033e008a9ca3596 /src/corelib/global/qexceptionhandling.cpp | |
| parent | d9264ee65d6f24e1008b08494b1472a54ac01940 (diff) | |
Replace qTerminate() with std::terminate() and mark it for removal
It was used by the QT_TERMINATE_ON_EXCEPTION macro, introduced in 2012,
to support pre-C++11 noexcept semantics. That macro was removed for Qt
6.8 in commit 9b2ae564a59656d9cf49b141e70f5958b4fb79a4. This commit
amends that removing the definition of qTerminate() immediately in Qt
6.9 (it was an \internal function).
Pick-to: 6.9
Change-Id: I9682121c04fafb3676b0fffd9f5ac999e7603c84
Reviewed-by: Ahmad Samir <a.samirh78@gmail.com>
Diffstat (limited to 'src/corelib/global/qexceptionhandling.cpp')
| -rw-r--r-- | src/corelib/global/qexceptionhandling.cpp | 20 |
1 files changed, 0 insertions, 20 deletions
diff --git a/src/corelib/global/qexceptionhandling.cpp b/src/corelib/global/qexceptionhandling.cpp deleted file mode 100644 index f74eb495464..00000000000 --- a/src/corelib/global/qexceptionhandling.cpp +++ /dev/null @@ -1,20 +0,0 @@ -// Copyright (C) 2022 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only - -#include "qexceptionhandling.h" - -#include <exception> - -QT_BEGIN_NAMESPACE - -/* - \internal - Allows you to call std::terminate() without including <exception>. - Called internally from QT_TERMINATE_ON_EXCEPTION -*/ -Q_NORETURN void qTerminate() noexcept -{ - std::terminate(); -} - -QT_END_NAMESPACE |