projects
/
profile
/
ivi
/
qtdeclarative.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
16d1974
)
QtDeclarative: Fix warning about construction of a QString from ASCII.
author
Friedemann Kleint
<Friedemann.Kleint@nokia.com>
Mon, 21 May 2012 10:41:37 +0000
(12:41 +0200)
committer
Qt by Nokia
<qt-info@nokia.com>
Mon, 21 May 2012 13:54:47 +0000
(15:54 +0200)
Change-Id: I893fc4cb9741ec930e35fabdc9bdccca0e467e5e
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
src/qml/qml/qqmlboundsignal.cpp
patch
|
blob
|
history
diff --git
a/src/qml/qml/qqmlboundsignal.cpp
b/src/qml/qml/qqmlboundsignal.cpp
index
8f15e0a
..
9a3ce65
100644
(file)
--- a/
src/qml/qml/qqmlboundsignal.cpp
+++ b/
src/qml/qml/qqmlboundsignal.cpp
@@
-146,7
+146,8
@@
void QQmlBoundSignalExpression::evaluate(QObject *secondaryScope)
if (!m_expressionFunctionValid) {
if (m_expressionFunctionRewritten) {
- m_v8function = evalFunction(context(), scopeObject(), m_expressionUtf8, m_fileName, m_line, &m_v8qmlscope);
+ m_v8function = evalFunction(context(), scopeObject(), QString::fromUtf8(m_expressionUtf8),
+ m_fileName, m_line, &m_v8qmlscope);
m_expressionUtf8.clear();
} else {
bool ok = true;