From: Lars Knoll <lars.knoll@digia.com>
Date: Tue, 16 Apr 2013 07:15:56 +0000 (+0200)
Subject: Fix a ### in Regexp.toString
X-Git-Tag: upstream/5.2.1~669^2~651
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=7f05643e401a86a233f768ddbb7b8f911cfb1570;p=platform%2Fupstream%2Fqtdeclarative.git

Fix a ### in Regexp.toString

The global flag wasn't converted back

Change-Id: I50a5518f6abf6315dee057ce5a4fe97550748cbb
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
---

diff --git a/src/qml/qml/v4vm/qv4regexpobject.cpp b/src/qml/qml/v4vm/qv4regexpobject.cpp
index 4dabb76..71c9f68 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())