From d27d6958c07fdb2d452484ddda0b615c43c8db7b Mon Sep 17 00:00:00 2001
From: Hugo Parente Lima <hugo.pl@gmail.com>
Date: Mon, 30 Aug 2010 17:28:13 -0300
Subject: Fix bug#309 - "QtCore.QByteArray() or list from
 QtCore.Qsettings.value() as default"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Reviewer: Luciano Wolf <luciano.wolf@openbossa.org>
          Renato Araújo <renato.araujo@openbossa.org>
---
 PySide/QtCore/qvariant_conversions.h | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'PySide')

diff --git a/PySide/QtCore/qvariant_conversions.h b/PySide/QtCore/qvariant_conversions.h
index 7a799e1c6..a471ce64a 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));
-- 
cgit v1.2.3