diff options
| author | Bradley T. Hughes <bradley.hughes@nokia.com> | 2009-06-26 12:12:36 (GMT) |
|---|---|---|
| committer | Bradley T. Hughes <bradley.hughes@nokia.com> | 2009-06-26 12:12:36 (GMT) |
| commit | 09da036f4f1857941af2939558e36172f5be4499 (patch) | |
| tree | 7e5e994be39044e8a1ad7a374c62aa331f15b3c3 /src | |
| parent | a181f32b35ae3fca6cee3f605500a20a4b27fe9c (diff) | |
| parent | 02c22119cf62873b785f9ae1628d530bcafb9ec1 (diff) | |
| download | Qt-09da036f4f1857941af2939558e36172f5be4499.zip Qt-09da036f4f1857941af2939558e36172f5be4499.tar.gz Qt-09da036f4f1857941af2939558e36172f5be4499.tar.bz2 | |
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt
Diffstat (limited to 'src')
| -rw-r--r-- | src/script/qscriptextqobject.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/script/qscriptextqobject.cpp b/src/script/qscriptextqobject.cpp index a3cb4e6..88fd007 100644 --- a/src/script/qscriptextqobject.cpp +++ b/src/script/qscriptextqobject.cpp @@ -2053,12 +2053,12 @@ bool ExtQMetaObjectData::resolve(const QScriptValueImpl &object, for (int i = 0; i < meta->enumeratorCount(); ++i) { QMetaEnum e = meta->enumerator(i); - for (int j = 0; j < e.keyCount(); ++j) { const char *key = e.key(j); - if (! qstrcmp (key, name.constData())) { - member->native(nameId, e.value(j), QScriptValue::ReadOnly); + member->native(nameId, e.value(j), + QScriptValue::ReadOnly + | QScriptValue::Undeletable); *base = object; return true; } |