diff options
| author | Hugo Parente Lima <hugo.pl@gmail.com> | 2010-09-28 18:07:02 -0300 |
|---|---|---|
| committer | Hugo Parente Lima <hugo.pl@gmail.com> | 2010-09-29 15:44:13 -0300 |
| commit | eabb9d37a78d1c584fe7e70928f0e820bd6e0afc (patch) | |
| tree | cb94c7d95e2ff0112843e877008eadb5bcb9b5e2 /PySide/QtCore/qvariant_conversions.h | |
| parent | 6ad03f2a795563aec47d45d6426639323f981975 (diff) | |
Fix bug#372 - "DiagramScene (GraphicsView) Example not working"
The correct title would be "QVariant doesn't correct store a QGraphicsScene object."
Diffstat (limited to 'PySide/QtCore/qvariant_conversions.h')
| -rw-r--r-- | PySide/QtCore/qvariant_conversions.h | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/PySide/QtCore/qvariant_conversions.h b/PySide/QtCore/qvariant_conversions.h index 06a8368cd..fc2dca55c 100644 --- a/PySide/QtCore/qvariant_conversions.h +++ b/PySide/QtCore/qvariant_conversions.h @@ -47,9 +47,6 @@ struct Converter<QVariant> return convertToVariantMap(pyObj); } else if (PySequence_Check(pyObj)) { return convertToVariantList(pyObj); - } else if (!isShibokenType(pyObj) || isUserType(pyObj)) { - // QVariant(User class) - return QVariant::fromValue<PySide::PyObjectWrapper>(pyObj); } else { // a class supported by QVariant? if (Shiboken::isShibokenType(pyObj)) { @@ -60,7 +57,7 @@ struct Converter<QVariant> void** data = reinterpret_cast<SbkBaseWrapper*>(pyObj)->cptr; if (typeName[strlen(typeName)-1] == '*') return QVariant(typeCode, data); - else + else if (!isUserType(pyObj)) // User types inherited from Value types *should* not be converted. return QVariant(typeCode, data[0]); } } |