diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-06-06 20:18:01 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2017-06-06 20:18:01 +0000 |
| commit | 5624e82d068ebab254239121810fc097af7fcb40 (patch) | |
| tree | 27d4a45faaa7cf948a6700bc680c2684893f4e2e /src/qml/jsruntime/qv4regexpobject.cpp | |
| parent | d7b45f7dc1d5f28ecdb022c5a4c7673bc55257c8 (diff) | |
| parent | c254cec22a2352a3fcab60244a6ab74f95d45ace (diff) | |
Merge "Merge remote-tracking branch 'origin/5.9' into dev" into refs/staging/dev
Diffstat (limited to 'src/qml/jsruntime/qv4regexpobject.cpp')
| -rw-r--r-- | src/qml/jsruntime/qv4regexpobject.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/qml/jsruntime/qv4regexpobject.cpp b/src/qml/jsruntime/qv4regexpobject.cpp index 85e37ebe82..735951e085 100644 --- a/src/qml/jsruntime/qv4regexpobject.cpp +++ b/src/qml/jsruntime/qv4regexpobject.cpp @@ -356,7 +356,7 @@ void RegExpPrototype::method_exec(const BuiltinFunction *, Scope &scope, CallDat } // fill in result data - ScopedArrayObject array(scope, scope.engine->newArrayObject(scope.engine->regExpExecArrayClass, scope.engine->arrayPrototype())); + ScopedArrayObject array(scope, scope.engine->newArrayObject(scope.engine->internalClasses[EngineBase::Class_RegExpExecArray], scope.engine->arrayPrototype())); int len = r->value()->captureCount(); array->arrayReserve(len); ScopedValue v(scope); |