diff options
| author | Aaron McCarthy <aaron.mccarthy@nokia.com> | 2010-02-22 01:05:17 (GMT) |
|---|---|---|
| committer | Aaron McCarthy <aaron.mccarthy@nokia.com> | 2010-02-22 01:05:17 (GMT) |
| commit | 0109df3ee449767c1836ec7028ac219c57cf9ca7 (patch) | |
| tree | 5fdc90fd34ac4e49ba05bef47a86427e4df71917 /src/script/api/qscriptengine.cpp | |
| parent | 46e84339a9eaf1587528c20a4c9e05bc1b549afd (diff) | |
| parent | 0a83a6c571fadb454cb8711aed84258b061d44b5 (diff) | |
| download | Qt-0109df3ee449767c1836ec7028ac219c57cf9ca7.zip Qt-0109df3ee449767c1836ec7028ac219c57cf9ca7.tar.gz Qt-0109df3ee449767c1836ec7028ac219c57cf9ca7.tar.bz2 | |
Merge remote branch 'origin/master' into bearermanagement/unit-tests
Conflicts:
src/network/access/qnetworkaccessmanager.cpp
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; } |