aboutsummaryrefslogtreecommitdiffstats
path: root/src/declarative/qml/v8/qv8typewrapper.cpp
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@nokia.com>2011-10-19 15:40:04 +0200
committerQt by Nokia <qt-info@nokia.com>2011-10-24 14:14:07 +0200
commit836c6279ebbb43e09d7754f3f43bfa29f9613315 (patch)
treea629c5069169923b9c6375c6cf86dce173a67701 /src/declarative/qml/v8/qv8typewrapper.cpp
parentd3ed664d23197397e3f140986841ea188cde8a65 (diff)
Update calls for keyToValue and keysToValue
They are from QMetaEnum and changed recently Task-number: QTBUG-21672 Change-Id: I46698ec7eb4a1b23068146593ee93f71fc53a815 Reviewed-by: Kent Hansen <kent.hansen@nokia.com> Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com> Reviewed-by: Liang Qi <liang.qi@nokia.com>
Diffstat (limited to 'src/declarative/qml/v8/qv8typewrapper.cpp')
-rw-r--r--src/declarative/qml/v8/qv8typewrapper.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/declarative/qml/v8/qv8typewrapper.cpp b/src/declarative/qml/v8/qv8typewrapper.cpp
index c89d5ab8ae..0023afc858 100644
--- a/src/declarative/qml/v8/qv8typewrapper.cpp
+++ b/src/declarative/qml/v8/qv8typewrapper.cpp
@@ -223,8 +223,9 @@ v8::Handle<v8::Value> QV8TypeWrapper::Getter(v8::Local<v8::String> property,
const QMetaObject *metaObject = moduleApi->qobjectApi->metaObject();
for (int ii = metaObject->enumeratorCount() - 1; ii >= 0; --ii) {
QMetaEnum e = metaObject->enumerator(ii);
- int value = e.keyToValue(enumName.constData());
- if (value != -1)
+ bool ok;
+ int value = e.keyToValue(enumName.constData(), &ok);
+ if (ok)
return v8::Integer::New(value);
}
}