diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2015-03-24 22:09:49 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2015-03-24 22:09:49 +0100 |
| commit | c8427a542bc61d95e4f313f22a0118ccf1e963a4 (patch) | |
| tree | cc9a9c6e31180c50a8d0a2f9b82ca84c9049c741 /src/qml/jsruntime/qv4engine.cpp | |
| parent | 7b7297470cde5645b2ea1db4cec7ac4bec87c1a3 (diff) | |
| parent | 3f2eabc8d90c4ee535cb0a2500e033171e203537 (diff) | |
Merge remote-tracking branch 'origin/5.5' into dev
Conflicts:
tests/auto/qml/qqmlitemmodels/testtypes.h
Change-Id: I2f2f3f47fd873ddd4fd027414654a861b56357f4
Diffstat (limited to 'src/qml/jsruntime/qv4engine.cpp')
| -rw-r--r-- | src/qml/jsruntime/qv4engine.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/qml/jsruntime/qv4engine.cpp b/src/qml/jsruntime/qv4engine.cpp index fd3b66226e..a4283825f7 100644 --- a/src/qml/jsruntime/qv4engine.cpp +++ b/src/qml/jsruntime/qv4engine.cpp @@ -1390,11 +1390,11 @@ QV4::ReturnedValue QV4::ExecutionEngine::fromVariant(const QVariant &variant) case QMetaType::UShort: return QV4::Encode((int)*reinterpret_cast<const unsigned short*>(ptr)); case QMetaType::Char: - return QV4::Encode((int)*reinterpret_cast<const char*>(ptr)); + return newString(QChar::fromLatin1(*reinterpret_cast<const char *>(ptr)))->asReturnedValue(); case QMetaType::UChar: - return QV4::Encode((int)*reinterpret_cast<const unsigned char*>(ptr)); + return newString(QChar::fromLatin1(*reinterpret_cast<const unsigned char *>(ptr)))->asReturnedValue(); case QMetaType::QChar: - return QV4::Encode((int)(*reinterpret_cast<const QChar*>(ptr)).unicode()); + return newString(*reinterpret_cast<const QChar *>(ptr))->asReturnedValue(); case QMetaType::QDateTime: return QV4::Encode(newDateObject(*reinterpret_cast<const QDateTime *>(ptr))); case QMetaType::QDate: |