summaryrefslogtreecommitdiffstats
path: root/PySide
diff options
context:
space:
mode:
authorHugo Parente Lima <hugo.pl@gmail.com>2010-08-30 17:28:13 -0300
committerHugo Parente Lima <hugo.pl@gmail.com>2010-08-30 17:46:25 -0300
commitd27d6958c07fdb2d452484ddda0b615c43c8db7b (patch)
tree755d85aea0654daa97fdceb6e829d00092df682f /PySide
parent7b2903ad21aba22798b4ceace38c34d29bf7b8cc (diff)
downloadpyside-d27d6958c07fdb2d452484ddda0b615c43c8db7b.tar.gz
pyside-d27d6958c07fdb2d452484ddda0b615c43c8db7b.tar.xz
pyside-d27d6958c07fdb2d452484ddda0b615c43c8db7b.zip
Fix bug#309 - "QtCore.QByteArray() or list from QtCore.Qsettings.value() as default"
Reviewer: Luciano Wolf <luciano.wolf@openbossa.org> Renato Ara├║jo <renato.araujo@openbossa.org>
Diffstat (limited to 'PySide')
-rw-r--r--PySide/QtCore/qvariant_conversions.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/PySide/QtCore/qvariant_conversions.h b/PySide/QtCore/qvariant_conversions.h
index 7a799e1..a471ce6 100644
--- a/PySide/QtCore/qvariant_conversions.h
+++ b/PySide/QtCore/qvariant_conversions.h
@@ -28,6 +28,9 @@ struct Converter<QVariant>
} else if (Converter<QString>::checkType(pyObj)) {
// QVariant(const char*)
return QVariant(Converter<QString>::toCpp(pyObj));
+ } else if (Converter<QByteArray>::checkType(pyObj)) {
+ // QVariant(QByteArray)
+ return QVariant(Converter<QByteArray>::toCpp(pyObj));
} else if (PyFloat_CheckExact(pyObj)) {
// QVariant(double)
return QVariant(Converter<double>::toCpp(pyObj));