From 73fd61d556735c9781847620c511bb43ccae9a95 Mon Sep 17 00:00:00 2001
From: Boxiang Sun <daetalusun@gmail.com>
Date: Fri, 29 Jun 2018 10:48:55 +0800
Subject: Implement proper convert from QString to PyUnicodeObject

Task-number: PYSIDE-336
Change-Id: Ie7d955b3b4d35e24a9eac5e7958ce2077370a34b
Reviewed-by: Christian Tismer <tismer@stackless.com>
---
 sources/pyside2/PySide2/QtCore/typesystem_core_common.xml | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/sources/pyside2/PySide2/QtCore/typesystem_core_common.xml b/sources/pyside2/PySide2/QtCore/typesystem_core_common.xml
index 488ee068b..d0806a19f 100644
--- a/sources/pyside2/PySide2/QtCore/typesystem_core_common.xml
+++ b/sources/pyside2/PySide2/QtCore/typesystem_core_common.xml
@@ -283,11 +283,8 @@
     <include file-name="QString" location="global"/>
     <conversion-rule>
         <native-to-target>
-        const int N = %in.length();
-        wchar_t *str = new wchar_t[N];
-        %in.toWCharArray(str);
-        PyObject *%out = PyUnicode_FromWideChar(str, N);
-        delete[] str;
+        QByteArray ba = %in.toUtf8();
+        PyObject *%out = PyUnicode_FromStringAndSize(ba.constData(), ba.size());
         return %out;
         </native-to-target>
         <target-to-native>
-- 
cgit v1.2.3