10 files changed, 110 insertions, 15 deletions
diff --git a/sources/pyside6/PySide6/QtCore/typesystem_core_common.xml b/sources/pyside6/PySide6/QtCore/typesystem_core_common.xml
index 2721bcc76..646c2f311 100644
--- a/sources/pyside6/PySide6/QtCore/typesystem_core_common.xml
+++ b/sources/pyside6/PySide6/QtCore/typesystem_core_common.xml
@@ -1602,12 +1602,6 @@
       <modify-argument index="return">
         <define-ownership class="native" owner="c++"/>
       </modify-argument>
-      <inject-code class="native" position="end" file="../glue/qtcore.cpp"
-                   snippet="qabstractitemmodel_data"/>
-    </modify-function>
-    <modify-function signature="headerData(int,Qt::Orientation,int)const">
-      <inject-code class="native" position="end" file="../glue/qtcore.cpp"
-                   snippet="qabstractitemmodel_data"/>
     </modify-function>
     <modify-function signature="dataChanged(const QModelIndex&amp;,const QModelIndex&amp;,const QVector&lt;int&gt;&amp;)" allow-thread="yes"/>
     <modify-function signature="layoutAboutToBeChanged(const QList&lt;QPersistentModelIndex&gt;&amp;,QAbstractItemModel::LayoutChangeHint)" allow-thread="yes"/>
diff --git a/sources/pyside6/PySide6/glue/qtcore.cpp b/sources/pyside6/PySide6/glue/qtcore.cpp
index 19f3ec1ba..ddb5a9ffa 100644
--- a/sources/pyside6/PySide6/glue/qtcore.cpp
+++ b/sources/pyside6/PySide6/glue/qtcore.cpp
@@ -1749,14 +1749,6 @@ static PyObject *invokeMethodHelper(QObject *obj, const char *member, Qt::Connec
 %PYARG_0 = invokeMethodHelper(%1, %2, Qt::AutoConnection, %3, %4, %5, %6);
 // @snippet qmetaobject-invokemethod-return-arg
 
-// @snippet qabstractitemmodel_data
-::QVariant %0;
-if (Shiboken::Enum::check(%PYARG_0))
-    %0 = QVariant(int(Shiboken::Enum::getValue(%PYARG_0)));
-else
-    pythonToCpp(pyResult, &cppResult);
-// @snippet qabstractitemmodel_data
-
 // @snippet keycombination-from-keycombination
 cptr = new ::%TYPE(%1);
 // @snippet keycombination-from-keycombination
diff --git a/sources/pyside6/libpyside/signalmanager.cpp b/sources/pyside6/libpyside/signalmanager.cpp
index efafb0aaf..753b50557 100644
--- a/sources/pyside6/libpyside/signalmanager.cpp
+++ b/sources/pyside6/libpyside/signalmanager.cpp
@@ -20,6 +20,7 @@
 #include <sbkstring.h>
 #include <sbkstaticstrings.h>
 #include <sbkerrors.h>
+#include <sbkenum_p.h>
 
 #include <QtCore/QByteArrayView>
 #include <QtCore/QDebug>
@@ -129,6 +130,14 @@ PyObjectWrapper::operator PyObject *() const
     return m_me;
 }
 
+
+int PyObjectWrapper::toInt() const
+{
+    // hold the GIL
+    Shiboken::GilState state;
+    return Shiboken::Enum::check(m_me) ? Shiboken::Enum::getValue(m_me) : -1;
+}
+
 QDataStream &operator<<(QDataStream &out, const PyObjectWrapper &myObj)
 {
     if (Py_IsInitialized() == 0) {
@@ -242,6 +251,8 @@ SignalManager::SignalManager() : m_d(new SignalManagerPrivate)
 
     // Register PyObject type to use in queued signal and slot connections
     qRegisterMetaType<PyObjectWrapper>("PyObject");
+    // Register QVariant(enum) conversion to QVariant(int)
+    QMetaType::registerConverter<PyObjectWrapper, int>(&PyObjectWrapper::toInt);
 
     SbkConverter *converter = Shiboken::Conversions::createConverter(&PyBaseObject_Type, nullptr);
     Shiboken::Conversions::setCppPointerToPythonFunction(converter, PyObject_PTR_CppToPython_PyObject);
diff --git a/sources/pyside6/libpyside/signalmanager.h b/sources/pyside6/libpyside/signalmanager.h
index 8315cb1aa..3c5bd9822 100644
--- a/sources/pyside6/libpyside/signalmanager.h
+++ b/sources/pyside6/libpyside/signalmanager.h
@@ -35,6 +35,14 @@ public:
     ~PyObjectWrapper();
     operator PyObject*() const;
 
+    // FIXME: To be removed in Qt7
+    // This was done to make QAbstractItemModel::data() work without explicit conversion of
+    // QVariant(PyObjectWrapper) to QVariant(int). This works because QAbstractItemModel::data()
+    // inturn calls legacyEnumValueFromModelData(const QVariant &data). But this function will
+    // be removed in Qt7.
+    // The proper fix would be to associate PyObjectWrapper to the corresponding C++ Enum.
+    int toInt() const;
+
 private:
     PyObject* m_me;
 };
diff --git a/sources/pyside6/tests/pysidetest/CMakeLists.txt b/sources/pyside6/tests/pysidetest/CMakeLists.txt
index f64cea904..6dc56735d 100644
--- a/sources/pyside6/tests/pysidetest/CMakeLists.txt
+++ b/sources/pyside6/tests/pysidetest/CMakeLists.txt
@@ -28,6 +28,7 @@ pysidetest_macros.h
 sharedpointertestbench.cpp sharedpointertestbench.h
 testobject.cpp testobject.h
 testview.cpp testview.h
+testqvariantenum.cpp testqvariantenum.h
 )
 
 set(testbinding_SRC
@@ -44,6 +45,7 @@ ${CMAKE_CURRENT_BINARY_DIR}/testbinding/qsharedpointer_int_wrapper.cpp
 ${CMAKE_CURRENT_BINARY_DIR}/testbinding/sharedpointertestbench_wrapper.cpp
 ${CMAKE_CURRENT_BINARY_DIR}/testbinding/testview_wrapper.cpp
 ${CMAKE_CURRENT_BINARY_DIR}/testbinding/testbinding_module_wrapper.cpp
+${CMAKE_CURRENT_BINARY_DIR}/testbinding/testqvariantenum_wrapper.cpp
 )
 
 # Get per module include dirs.
diff --git a/sources/pyside6/tests/pysidetest/pysidetest_global.h b/sources/pyside6/tests/pysidetest/pysidetest_global.h
index 461b6f56f..6f784dc58 100644
--- a/sources/pyside6/tests/pysidetest/pysidetest_global.h
+++ b/sources/pyside6/tests/pysidetest/pysidetest_global.h
@@ -11,5 +11,6 @@
 #include "flagstest.h"
 #include "hiddenobject.h"
 #include "sharedpointertestbench.h"
+#include "testqvariantenum.h"
 
 #endif // PYSIDETEST_GLOBAL_H
diff --git a/sources/pyside6/tests/pysidetest/qvariant_test.py b/sources/pyside6/tests/pysidetest/qvariant_test.py
index 5addb00e0..df623146d 100644
--- a/sources/pyside6/tests/pysidetest/qvariant_test.py
+++ b/sources/pyside6/tests/pysidetest/qvariant_test.py
@@ -1,6 +1,7 @@
 # Copyright (C) 2022 The Qt Company Ltd.
 # SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
 
+import enum
 import os
 import sys
 import unittest
@@ -10,13 +11,25 @@ sys.path.append(os.fspath(Path(__file__).resolve().parents[1]))
 from init_paths import init_test_paths
 init_test_paths(True)
 
-from testbinding import TestObject
+from testbinding import TestObject, TestQVariantEnum
 from PySide6.QtCore import Qt, QKeyCombination
 from PySide6.QtGui import QKeySequence, QAction
 
 from helper.usesqapplication import UsesQApplication
 
 
+class PyTestQVariantEnum(TestQVariantEnum):
+    def __init__(self, var_enum):
+        super().__init__(var_enum)
+
+    def getRValEnum(self):
+        return Qt.Orientation.Vertical
+
+    def channelingEnum(self, rval_enum):
+        return (isinstance(rval_enum, enum.Enum) and
+                rval_enum == Qt.Orientation.Vertical)
+
+
 class QVariantTest(UsesQApplication):
 
     def testQKeySequenceQVariantOperator(self):
@@ -35,6 +48,24 @@ class QVariantTest(UsesQApplication):
         # Issues a warning but works as well
         QKeySequence(Qt.CTRL + Qt.Key_Q)
 
+    def testEnum(self):
+        # Testing C++ class
+        testqvariant = TestQVariantEnum(Qt.CheckState.Checked)
+        self.assertEqual(testqvariant.getLValEnum(), Qt.CheckState.Checked)
+        self.assertIsInstance(testqvariant.getLValEnum(), enum.Enum)
+        # in the case where we return a QVariant of C++ enum, it returns a
+        # QVariant(int) to Python unless explicitly handled manually by Shiboken
+        self.assertEqual(testqvariant.getRValEnum(), 1)
+        self.assertEqual(testqvariant.isEnumChanneled(), False)
+
+        # Testing Python child class
+        pytestqvariant = PyTestQVariantEnum(Qt.CheckState.Checked)
+        self.assertEqual(pytestqvariant.isEnumChanneled(), True)
+        # check toInt() conversion works for PyObjectWrapper
+        self.assertEqual(PyTestQVariantEnum.getNumberFromQVarEnum(Qt.Orientation.Vertical), 2)
+        # check toInt() conversion for IntEnum
+        self.assertEqual(PyTestQVariantEnum.getNumberFromQVarEnum(Qt.GestureType.TapGesture), 1)
+
 
 if __name__ == '__main__':
     unittest.main()
diff --git a/sources/pyside6/tests/pysidetest/testqvariantenum.cpp b/sources/pyside6/tests/pysidetest/testqvariantenum.cpp
new file mode 100644
index 000000000..7135e422a
--- /dev/null
+++ b/sources/pyside6/tests/pysidetest/testqvariantenum.cpp
@@ -0,0 +1,29 @@
+// Copyright (C) 2023 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
+
+#include "testqvariantenum.h"
+
+QVariant TestQVariantEnum::getLValEnum() const
+{
+    return this->m_enum;
+}
+
+QVariant TestQVariantEnum::getRValEnum() const
+{
+    return QVariant(Qt::Orientation::Horizontal);
+}
+
+int TestQVariantEnum::getNumberFromQVarEnum(QVariant variantEnum)
+{
+    return variantEnum.toInt();
+}
+
+bool TestQVariantEnum::channelingEnum([[maybe_unused]] QVariant rvalEnum) const
+{
+   return false;
+}
+
+bool TestQVariantEnum::isEnumChanneled() const
+{
+    return this->channelingEnum(this->getRValEnum());
+}
diff --git a/sources/pyside6/tests/pysidetest/testqvariantenum.h b/sources/pyside6/tests/pysidetest/testqvariantenum.h
new file mode 100644
index 000000000..46564d268
--- /dev/null
+++ b/sources/pyside6/tests/pysidetest/testqvariantenum.h
@@ -0,0 +1,25 @@
+// Copyright (C) 2023 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
+
+#ifndef TESTQVARIANT_H
+#define TESTQVARIANT_H
+
+#include "pysidetest_macros.h"
+
+#include <QtCore/QVariant>
+
+class PYSIDETEST_API TestQVariantEnum
+{
+public:
+    TestQVariantEnum(QVariant lvalue_enum) : m_enum(lvalue_enum) {}
+    QVariant getLValEnum() const;
+    static int getNumberFromQVarEnum(QVariant variantEnum = QVariant());
+    bool isEnumChanneled() const;
+    virtual QVariant getRValEnum() const;
+    virtual bool channelingEnum(QVariant rvalEnum) const;
+    virtual ~TestQVariantEnum() = default;
+private:
+    QVariant m_enum;
+};
+
+#endif // TESTQVARIANT_H
diff --git a/sources/pyside6/tests/pysidetest/typesystem_pysidetest.xml b/sources/pyside6/tests/pysidetest/typesystem_pysidetest.xml
index 7f1170466..f8a8d2b6b 100644
--- a/sources/pyside6/tests/pysidetest/typesystem_pysidetest.xml
+++ b/sources/pyside6/tests/pysidetest/typesystem_pysidetest.xml
@@ -63,6 +63,8 @@
         </modify-function>
     </object-type>
 
+    <value-type name="TestQVariantEnum"/>
+
     <namespace-type name="FlagsNamespace" visible="no">
         <enum-type name="Option" flags="Options"/>
         <object-type name="ClassForEnum" />