diff options
| author | Michael Brasser <michael.brasser@nokia.com> | 2010-02-19 00:22:59 (GMT) |
|---|---|---|
| committer | Michael Brasser <michael.brasser@nokia.com> | 2010-02-19 00:22:59 (GMT) |
| commit | af47bfaee19cb2924b4fde69ec5c4c14601dfc96 (patch) | |
| tree | 30daabc8745103df89ea6dd21bf331d574cb5201 /src/script/api/qscriptengine.cpp | |
| parent | da055325393872e9399577d1962486fb6e3102c7 (diff) | |
| parent | 7175c49346a147558d65c5b10565423a6d8ea9ec (diff) | |
| download | Qt-af47bfaee19cb2924b4fde69ec5c4c14601dfc96.zip Qt-af47bfaee19cb2924b4fde69ec5c4c14601dfc96.tar.gz Qt-af47bfaee19cb2924b4fde69ec5c4c14601dfc96.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml
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; } |