Qt6 compatibility fixes for core PythonQt library #109
Conversation
| @@ -463,8 +463,8 @@ static PyObject *PythonQtClassWrapper_getattro(PyObject *obj, PyObject *name) | |||
| } | |||
| PyObject* dict = PyDict_New(); | |||
|
|
|||
| QSet<QString> completeSet = QSet<QString>::fromList(wrapper->classInfo()->memberList()); | |||
| completeSet.unite(QSet<QString>::fromList(wrapper->classInfo()->propertyList())); | |||
| QSet<QString> completeSet(wrapper->classInfo()->memberList().begin(), wrapper->classInfo()->memberList().end()); | |||
There was a problem hiding this comment.
Both memberList() and propertyList() return a new QStringList object; it isn't a valid use to use begin() and end() from different list instances, even if it seems to work for you.
Assign the result of memberList() and propertyList() to a local variable and use begin() and end() on that.
| @@ -1015,17 +1015,17 @@ QVariant PythonQtConv::PyObjToQVariant(PyObject* val, int type) | |||
| if (wrap->classInfo()->isCPPWrapper()) { | |||
| if (wrap->classInfo()->metaTypeId()>0) { | |||
| // construct a new variant from the C++ object if it has a meta type (this will COPY the object!) | |||
| v = QVariant(wrap->classInfo()->metaTypeId(), wrap->_wrappedPtr); | |||
| v = QVariant(QMetaType(wrap->classInfo()->metaTypeId()), wrap->_wrappedPtr); | |||
There was a problem hiding this comment.
Just a note: It seems this constructor of QVariant only exists for Qt6, so we can't merge this as is into master, as this would break compatibility with Qt5.
I'd prefer to have the same code of the PythonQt library itself for Qt5 and Qt6 (the binding generator is a completely different thing), so we will need a few #if QT_VERSION >= 0x060000 statements. And we will need to decide which Qt5 versions we still want to support.
| @@ -25,12 +25,16 @@ isEmpty(PYTHONQT_STATIC) { | |||
|
|
|||
| DEFINES += PYTHONQT_CATCH_ALL_EXCEPTIONS | |||
|
|
|||
| contains(QT_MAJOR_VERSION, 5) { | |||
| contains(QT_MAJOR_VERSION, 6) { | |||
There was a problem hiding this comment.
Note: Perhaps use
contains(QT_MAJOR_VERSION, 5)|contains(QT_MAJOR_VERSION, 6)
when we achieve true compatibility with Qt5 and Qt6
There was a problem hiding this comment.
As this is for Qt5 and 6 only, there is no need for the check at all.
|
Sorry, accidentally merged that - have reverted it, but I created a new Qt6 branch which I rebased against your branch, to do further work. |
No description provided.