diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2021-11-18 15:05:17 +0100 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2021-12-08 08:48:50 +0100 |
| commit | 862948599999e4e5701452a3f479182606e16a89 (patch) | |
| tree | 585769e3cc6891334ab340ff82c16e7352e41b06 /sources/pyside6/PySide6/QtQml/pysideqmlmetacallerror.cpp | |
| parent | 244477a81445bf6f38cda3f8fe213daaa5908166 (diff) | |
Move the QML registration code into a library
This makes the code easier to maintain.
Task-number: PYSIDE-1709
Change-Id: Idb75143a7e6d218637ab75463db88b6135cd4086
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
Diffstat (limited to 'sources/pyside6/PySide6/QtQml/pysideqmlmetacallerror.cpp')
| -rw-r--r-- | sources/pyside6/PySide6/QtQml/pysideqmlmetacallerror.cpp | 96 |
1 files changed, 0 insertions, 96 deletions
diff --git a/sources/pyside6/PySide6/QtQml/pysideqmlmetacallerror.cpp b/sources/pyside6/PySide6/QtQml/pysideqmlmetacallerror.cpp deleted file mode 100644 index ec3de6c24..000000000 --- a/sources/pyside6/PySide6/QtQml/pysideqmlmetacallerror.cpp +++ /dev/null @@ -1,96 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2021 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of Qt for Python. -** -** $QT_BEGIN_LICENSE:LGPL$ -** 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 Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or (at your option) the GNU General -** Public license version 3 or any later version approved by the KDE Free -** Qt Foundation. The licenses are as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 -** 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-2.0.html and -** https://www.gnu.org/licenses/gpl-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#include "pysideqmlmetacallerror_p.h" - -#include <sbkpython.h> -#include <sbkstring.h> -#include <autodecref.h> - -#include <QtCore/QObject> -#include <QtCore/QString> - -#include <QtQml/QQmlEngine> -#include <QtQml/QQmlListProperty> - -#if __has_include (<private/qv4engine_p.h>) -# define QML_PRIVATE_API_SUPPORT -# include <private/qv4engine_p.h> -# include <private/qv4context_p.h> -# include <private/qqmldata_p.h> -#endif - -namespace PySide { - -std::optional<int> qmlMetaCallErrorHandler(QObject *object) -{ -#ifdef QML_PRIVATE_API_SUPPORT - // This JS engine grabber based off of Qt 5.5's `qjsEngine` function - QQmlData *data = QQmlData::get(object, false); - if (!data || data->jsWrapper.isNullOrUndefined()) - return {}; - - QV4::ExecutionEngine *engine = data->jsWrapper.engine(); - if (engine->currentStackFrame == nullptr) - return {}; - - PyObject *errType, *errValue, *errTraceback; - PyErr_Fetch(&errType, &errValue, &errTraceback); - // PYSIDE-464: The error is only valid before PyErr_Restore, - // PYSIDE-464: therefore we take local copies. - Shiboken::AutoDecRef objStr(PyObject_Str(errValue)); - const QString errString = QLatin1String(Shiboken::String::toCString(objStr)); - const bool isSyntaxError = errType == PyExc_SyntaxError; - const bool isTypeError = errType == PyExc_TypeError; - PyErr_Restore(errType, errValue, errTraceback); - - PyErr_Print(); // Note: PyErr_Print clears the error. - - if (isSyntaxError) - return engine->throwSyntaxError(errString); - if (isTypeError) - return engine->throwTypeError(errString); - return engine->throwError(errString); -#else - Q_UNUSED(object); - return {}; -#endif // QML_PRIVATE_API_SUPPORT -} - -} // namespace PySide |