aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorLars Knoll <lars.knoll@digia.com>2013-04-16 09:15:56 +0200
committerSimon Hausmann <simon.hausmann@digia.com>2013-04-16 11:01:23 +0200
commit7f05643e401a86a233f768ddbb7b8f911cfb1570 (patch)
tree65e6ca8ab40fab5fd4b9c6e8a31e1eedfffa9572 /src
parent1c5d88994c57c50fc8ffe4cd5d2b8d5d0b7c8084 (diff)
Fix a ### in Regexp.toString
The global flag wasn't converted back Change-Id: I50a5518f6abf6315dee057ce5a4fe97550748cbb Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Diffstat (limited to 'src')
-rw-r--r--src/qml/qml/v4vm/qv4regexpobject.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/qml/qml/v4vm/qv4regexpobject.cpp b/src/qml/qml/v4vm/qv4regexpobject.cpp
index 4dabb76c1f..71c9f685fe 100644
--- a/src/qml/qml/v4vm/qv4regexpobject.cpp
+++ b/src/qml/qml/v4vm/qv4regexpobject.cpp
@@ -233,7 +233,8 @@ Value RegExpPrototype::method_toString(SimpleCallContext *ctx)
QString result = QChar('/') + r->value->pattern();
result += QChar('/');
- // ### 'g' option missing
+ if (r->global)
+ result += QChar('g');
if (r->value->ignoreCase())
result += QChar('i');
if (r->value->multiLine())