diff options
| author | Martin Jones <martin.jones@nokia.com> | 2010-03-01 03:56:02 (GMT) |
|---|---|---|
| committer | Martin Jones <martin.jones@nokia.com> | 2010-03-01 03:56:02 (GMT) |
| commit | 9b54e9e7168cafd3885a0784dd24f74b8ad058ab (patch) | |
| tree | 2464a4194ad9237494f5828a00321eadee1c1d4e /src/script/api/qscriptengine.cpp | |
| parent | 2c3cc70107d2a4ae32e092703dd6a7de734bee4a (diff) | |
| parent | b1e097af8c0537794a64cfacd23848f8a2a7f0ca (diff) | |
| download | Qt-9b54e9e7168cafd3885a0784dd24f74b8ad058ab.zip Qt-9b54e9e7168cafd3885a0784dd24f74b8ad058ab.tar.gz Qt-9b54e9e7168cafd3885a0784dd24f74b8ad058ab.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 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/script/api/qscriptengine.cpp b/src/script/api/qscriptengine.cpp index 98a24d0..d2e96d1 100644 --- a/src/script/api/qscriptengine.cpp +++ b/src/script/api/qscriptengine.cpp @@ -844,7 +844,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>(); |