diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2021-02-26 14:47:59 +0100 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2021-03-10 08:48:07 +0100 |
| commit | f7901b0b29e831a3799bd7fc39dbdf5e67271ae8 (patch) | |
| tree | dfe67473b4bca93cb3eb7e2c7ca41ed121611175 /sources/shiboken6/ApiExtractor/exception.h | |
| parent | 7cd7141e43e98d4862de3aadf128b0d0080090c9 (diff) | |
shiboken6: No longer crash on fatal errors
shiboken has some fatal errors which are too deeply nested to
catch with return values. Introduce exception handling to
handle this.
Add an exception class and replace the existing qFatal() calls
by a exceptions. Wrap a try/catch around main() and the tester
helper.
Change-Id: I03243849dc299f7696ef73d9d4123480ac5cbd66
Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
Diffstat (limited to 'sources/shiboken6/ApiExtractor/exception.h')
| -rw-r--r-- | sources/shiboken6/ApiExtractor/exception.h | 52 |
1 files changed, 52 insertions, 0 deletions
diff --git a/sources/shiboken6/ApiExtractor/exception.h b/sources/shiboken6/ApiExtractor/exception.h new file mode 100644 index 000000000..36e94638a --- /dev/null +++ b/sources/shiboken6/ApiExtractor/exception.h @@ -0,0 +1,52 @@ +/**************************************************************************** +** +** Copyright (C) 2021 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ +** +** This file is part of Qt for Python. +** +** $QT_BEGIN_LICENSE:GPL-EXCEPT$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3 as published by the Free Software +** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-3.0.html. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#ifndef EXCEPTION_H +#define EXCEPTION_H + +#include <QString> + +#include <string> +#include <exception> + +class Exception : public std::exception +{ +public: + explicit Exception(const QString &message) : m_message(message.toUtf8()) {} + explicit Exception(const char *message) : m_message(message) {} + + const char *what() const noexcept override + { + return m_message.c_str(); + } + +private: + const std::string m_message; +}; + +#endif // EXCEPTION |