diff options
Diffstat (limited to 'src/declarative/qml/v8/qv8engine.cpp')
-rw-r--r-- | src/declarative/qml/v8/qv8engine.cpp | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/src/declarative/qml/v8/qv8engine.cpp b/src/declarative/qml/v8/qv8engine.cpp index 6195345aae..3964134201 100644 --- a/src/declarative/qml/v8/qv8engine.cpp +++ b/src/declarative/qml/v8/qv8engine.cpp @@ -491,16 +491,7 @@ QVariant QV8Engine::toBasicVariant(v8::Handle<v8::Value> value) if (value->IsRegExp()) { v8::Context::Scope scope(context()); - v8::Handle<v8::RegExp> jsRegExp = v8::Handle<v8::RegExp>::Cast(value); - // Copied from QtScript - // Converts a JS RegExp to a QRegExp. - // The conversion is not 100% exact since ECMA regexp and QRegExp - // have different semantics/flags, but we try to do our best. - QString pattern = toString(jsRegExp->GetSource()); - Qt::CaseSensitivity caseSensitivity = Qt::CaseSensitive; - if (jsRegExp->GetFlags() & v8::RegExp::kIgnoreCase) - caseSensitivity = Qt::CaseInsensitive; - return QRegExp(pattern, caseSensitivity, QRegExp::RegExp2); + return QJSConverter::toRegExp(v8::Handle<v8::RegExp>::Cast(value)); } else if (value->IsArray()) { v8::Context::Scope scope(context()); QVariantList rv; |