diff options
| author | Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com> | 2010-02-19 15:08:45 (GMT) |
|---|---|---|
| committer | Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com> | 2010-02-19 15:08:45 (GMT) |
| commit | aaeb5a1f1e4d9ef6b24c3641ce1a0f9ba630b6d5 (patch) | |
| tree | d8cdf354de1650927087b723cf1421cff8ee2972 /src/script/api/qscriptengine.cpp | |
| parent | bbdee08472a0763ed9a60ce60f60ddb86bd946df (diff) | |
| parent | 477bf4379b0eb7b9a44f4730ce9b8fc07a8e635e (diff) | |
| download | Qt-aaeb5a1f1e4d9ef6b24c3641ce1a0f9ba630b6d5.zip Qt-aaeb5a1f1e4d9ef6b24c3641ce1a0f9ba630b6d5.tar.gz Qt-aaeb5a1f1e4d9ef6b24c3641ce1a0f9ba630b6d5.tar.bz2 | |
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2
Diffstat (limited to 'src/script/api/qscriptengine.cpp')
| -rw-r--r-- | src/script/api/qscriptengine.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/script/api/qscriptengine.cpp b/src/script/api/qscriptengine.cpp index 1bd7377..237b6fd 100644 --- a/src/script/api/qscriptengine.cpp +++ b/src/script/api/qscriptengine.cpp @@ -846,8 +846,7 @@ QScriptEnginePrivate::~QScriptEnginePrivate() QScriptValue QScriptEnginePrivate::scriptValueFromVariant(const QVariant &v) { - Q_Q(QScriptEngine); - QScriptValue result = q->create(v.userType(), v.data()); + QScriptValue result = create(v.userType(), v.data()); Q_ASSERT(result.isValid()); return result; } |