diff options
| author | Kurt Korbatits <kurt.korbatits@nokia.com> | 2010-02-23 03:42:37 (GMT) |
|---|---|---|
| committer | Kurt Korbatits <kurt.korbatits@nokia.com> | 2010-02-23 03:42:37 (GMT) |
| commit | aa90ed9a169b169fc1ea6bcc9f4588785957b4d8 (patch) | |
| tree | a35a505f45a7804a2cf3548a9f43cadcdf9d4b86 /src/script/api/qscriptengine.cpp | |
| parent | 04532ba052559b265b1bc85dc143d8aeeb02149f (diff) | |
| parent | 53523bd15cb977ca066a951bae3cc7501d77e143 (diff) | |
| download | Qt-aa90ed9a169b169fc1ea6bcc9f4588785957b4d8.zip Qt-aa90ed9a169b169fc1ea6bcc9f4588785957b4d8.tar.gz Qt-aa90ed9a169b169fc1ea6bcc9f4588785957b4d8.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4.6
Diffstat (limited to 'src/script/api/qscriptengine.cpp')
| -rw-r--r-- | src/script/api/qscriptengine.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/script/api/qscriptengine.cpp b/src/script/api/qscriptengine.cpp index 1bd7377..1199263 100644 --- a/src/script/api/qscriptengine.cpp +++ b/src/script/api/qscriptengine.cpp @@ -768,7 +768,7 @@ static QScriptValue __setupPackage__(QScriptContext *ctx, QScriptEngine *eng) } // namespace QScript QScriptEnginePrivate::QScriptEnginePrivate() - : registeredScriptValues(0), freeScriptValues(0), + : registeredScriptValues(0), freeScriptValues(0), freeScriptValuesCount(0), registeredScriptStrings(0), inEval(false) { qMetaTypeId<QScriptValue>(); |