diff options
| author | Janne Anttila <janne.anttila@digia.com> | 2009-09-02 08:14:33 (GMT) |
|---|---|---|
| committer | Janne Anttila <janne.anttila@digia.com> | 2009-09-02 08:14:33 (GMT) |
| commit | c0358c891d91b7fe78f439eefc706d87099e2634 (patch) | |
| tree | dccd4560a111972ed1317b711d028420dded071a /src/script/api/qscriptengine.cpp | |
| parent | 584129c518719df51bc4812cc30773ab81e3f3cd (diff) | |
| parent | 0b5a81dd9aa153f6cd3a3929ee7ed82ca48f45a5 (diff) | |
| download | Qt-c0358c891d91b7fe78f439eefc706d87099e2634.zip Qt-c0358c891d91b7fe78f439eefc706d87099e2634.tar.gz Qt-c0358c891d91b7fe78f439eefc706d87099e2634.tar.bz2 | |
Merge branch '4.6' of git@scm.dev.troll.no:qt/qt into 4.6
Diffstat (limited to 'src/script/api/qscriptengine.cpp')
| -rw-r--r-- | src/script/api/qscriptengine.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/script/api/qscriptengine.cpp b/src/script/api/qscriptengine.cpp index d467250..3ffc9c5 100644 --- a/src/script/api/qscriptengine.cpp +++ b/src/script/api/qscriptengine.cpp @@ -3622,9 +3622,7 @@ QScriptEngineAgent *QScriptEngine::agent() const QScriptString QScriptEngine::toStringHandle(const QString &str) { Q_D(QScriptEngine); - QScriptString ss; - QScriptStringPrivate::init(ss, this, JSC::Identifier(d->currentFrame, str)); - return ss; + return d->scriptStringFromJSCIdentifier(JSC::Identifier(d->currentFrame, str)); } /*! |