fixed Converter<QString>::isConvertible() method to consider all the cases;

also changed Converter<QString>::toCpp last return option to use a more
straightforward way to get the C++ object

1 files changed, 6 insertions, 2 deletions

diff --git a/PySide/QtCore/qstring_conversions.h b/PySide/QtCore/qstring_conversions.h
index 3f2766a41..e67bed1de 100644
--- a/PySide/QtCore/qstring_conversions.h
+++ b/PySide/QtCore/qstring_conversions.h
@@ -1,6 +1,10 @@
 inline bool Converter< QString >::isConvertible(PyObject* pyobj)
 {
-    return PyUnicode_Check(pyobj) || PyString_Check(pyobj);
+    return PyString_Check(pyobj)
+            || PyUnicode_Check(pyobj)
+            || PyQByteArray_Check(pyobj)
+            || PyQLatin1String_Check(pyobj)
+            || PyQChar_Check(pyobj);
 }
 
 inline PyObject* Converter< QString >::createWrapper(const QString* cppobj)
@@ -35,5 +39,5 @@ inline QString Converter< QString >::toCpp(PyObject* pyobj)
 #endif
     } else if (PyString_Check(pyobj))
         return QString(Converter< char * >::toCpp(pyobj));
-    return *Converter< QString* >::toCpp(pyobj);
+    return *PyQString_cptr(pyobj);
 }