5 files changed, 158 insertions, 0 deletions
diff --git a/sources/pyside6/PySide6/QtQml/CMakeLists.txt b/sources/pyside6/PySide6/QtQml/CMakeLists.txt
index fdc501c25..b23d3b12d 100644
--- a/sources/pyside6/PySide6/QtQml/CMakeLists.txt
+++ b/sources/pyside6/PySide6/QtQml/CMakeLists.txt
@@ -1,6 +1,7 @@
 project(QtQml)
 
 set(QtQml_static_sources "${QtQml_SOURCE_DIR}/pysideqmlregistertype.cpp"
+                         "${QtQml_SOURCE_DIR}/pysideqmlmetacallerror.cpp"
                          "${QtQml_SOURCE_DIR}/pysideqmllistproperty.cpp"
                          "${QtQml_SOURCE_DIR}/pysideqmlvolatilebool.cpp")
 
@@ -42,6 +43,7 @@ set(QtQml_include_dirs  ${QtQml_SOURCE_DIR}
                         ${Qt${QT_MAJOR_VERSION}Core_INCLUDE_DIRS}
                         ${Qt${QT_MAJOR_VERSION}Network_INCLUDE_DIRS}
                         ${Qt${QT_MAJOR_VERSION}Qml_INCLUDE_DIRS}
+                        ${Qt${QT_MAJOR_VERSION}Qml_PRIVATE_INCLUDE_DIRS}
                         ${libpyside_SOURCE_DIR}
                         ${QtCore_GEN_DIR}
                         ${QtNetwork_GEN_DIR}
diff --git a/sources/pyside6/PySide6/QtQml/pysideqmlmetacallerror.cpp b/sources/pyside6/PySide6/QtQml/pysideqmlmetacallerror.cpp
new file mode 100644
index 000000000..ec3de6c24
--- /dev/null
+++ b/sources/pyside6/PySide6/QtQml/pysideqmlmetacallerror.cpp
@@ -0,0 +1,96 @@
+/****************************************************************************
+**
+** 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
diff --git a/sources/pyside6/PySide6/QtQml/pysideqmlmetacallerror_p.h b/sources/pyside6/PySide6/QtQml/pysideqmlmetacallerror_p.h
new file mode 100644
index 000000000..9ecb0f6eb
--- /dev/null
+++ b/sources/pyside6/PySide6/QtQml/pysideqmlmetacallerror_p.h
@@ -0,0 +1,57 @@
+/****************************************************************************
+**
+** 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$
+**
+****************************************************************************/
+
+#ifndef PYSIDEQMLMETACALLERROR_P_H
+#define PYSIDEQMLMETACALLERROR_P_H
+
+#include <optional>
+
+#include <QtCore/QtGlobal>
+
+QT_FORWARD_DECLARE_CLASS(QObject)
+
+namespace PySide {
+
+// Helper for SignalManager::qt_metacall():
+// Bubbles Python exceptions up to the Javascript engine, if called from one
+std::optional<int> qmlMetaCallErrorHandler(QObject *object);
+
+} // namespace PySide
+
+#endif // PYSIDEQMLMETACALLERROR_P_H
diff --git a/sources/pyside6/PySide6/QtQml/typesystem_qml.xml b/sources/pyside6/PySide6/QtQml/typesystem_qml.xml
index 58b04d367..5772202ea 100644
--- a/sources/pyside6/PySide6/QtQml/typesystem_qml.xml
+++ b/sources/pyside6/PySide6/QtQml/typesystem_qml.xml
@@ -59,6 +59,8 @@
     #include "pysideqmlregistertype.h"
     #include "pysideqmllistproperty.h"
     #include "pysideqmlvolatilebool.h"
+    #include "pysideqmlmetacallerror_p.h"
+    #include &lt;signalmanager.h&gt;
     </inject-code>
 
     <!-- This is to inform the generator that the VolatileBool python type exists -->
diff --git a/sources/pyside6/PySide6/glue/qtqml.cpp b/sources/pyside6/PySide6/glue/qtqml.cpp
index f4a54a55a..44f3dc653 100644
--- a/sources/pyside6/PySide6/glue/qtqml.cpp
+++ b/sources/pyside6/PySide6/glue/qtqml.cpp
@@ -75,6 +75,7 @@ int %0 = PySide::qmlRegisterType(%ARGUMENT_NAMES, false);
 // @snippet init
 initQtQmlListProperty(module);
 initQtQmlVolatileBool(module);
+PySide::SignalManager::setQmlMetaCallErrorHandler(PySide::qmlMetaCallErrorHandler);
 // @snippet init
 
 // @snippet qjsengine-toscriptvalue