summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorOlivier Goffart <olivier.goffart@nokia.com>2010-08-06 10:40:01 (GMT)
committerOlivier Goffart <olivier.goffart@nokia.com>2010-08-06 11:05:04 (GMT)
commit73791fe53805f3bfad651c36fce9249441f864cd (patch)
tree92776c333e33b70ba137a14d9f0fb2d79ef02bce /src
parent2dddba7f6641e2a49912e87d07dfecd3bb68d916 (diff)
downloadQt-73791fe53805f3bfad651c36fce9249441f864cd.zip
Qt-73791fe53805f3bfad651c36fce9249441f864cd.tar.gz
Qt-73791fe53805f3bfad651c36fce9249441f864cd.tar.bz2
Fix recursion in QScriptEngine::toScriptValue
Introduced by mistake in 4232955aa9498a5e1e4e4b3fb4662222acffe70f Reviewed-by: Yoann Lopes
Diffstat (limited to 'src')
-rw-r--r--src/script/api/qscriptengine.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/script/api/qscriptengine.h b/src/script/api/qscriptengine.h
index cdf6099..27e5a13 100644
--- a/src/script/api/qscriptengine.h
+++ b/src/script/api/qscriptengine.h
@@ -212,7 +212,7 @@ public:
template <typename T>
inline QScriptValue toScriptValue(const T &value)
{
- return toScriptValue(value);
+ return qScriptValueFromValue(value);
}
template <typename T>
inline T fromScriptValue(const QScriptValue &value)