diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-09-20 18:57:07 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2017-09-20 18:57:07 +0000 |
| commit | 112d668c0fded8c6ab7bf40fd3800cf43e005f95 (patch) | |
| tree | b23889851a0d8c779bd7f2f3605375f8adc1cb05 /src/qml/jsruntime/qv4stringobject.cpp | |
| parent | ae805cafde1f327c9252b9d08449a08f052746d4 (diff) | |
| parent | 55a671ea73fbe657f360befa221e2c0c15ed4b0e (diff) | |
Merge "Merge remote-tracking branch 'origin/5.9' into 5.10" into refs/staging/5.10
Diffstat (limited to 'src/qml/jsruntime/qv4stringobject.cpp')
| -rw-r--r-- | src/qml/jsruntime/qv4stringobject.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/qml/jsruntime/qv4stringobject.cpp b/src/qml/jsruntime/qv4stringobject.cpp index 81f5c3566c..7c65c97d73 100644 --- a/src/qml/jsruntime/qv4stringobject.cpp +++ b/src/qml/jsruntime/qv4stringobject.cpp @@ -551,7 +551,7 @@ void StringPrototype::method_replace(const BuiltinFunction *, Scope &scope, Call break; } nMatchOffsets += re->captureCount() * 2; - if (!regExp->d()->global) + if (!regExp->global()) break; offset = qMax(offset + 1, matchOffsets[oldSize + 1]); } |