1 files changed, 22 insertions, 15 deletions
diff --git a/src/corelib/tools/qregexp.cpp b/src/corelib/tools/qregexp.cpp
index bebf141..f54a938 100644
--- a/src/corelib/tools/qregexp.cpp
+++ b/src/corelib/tools/qregexp.cpp
@@ -832,7 +832,7 @@ struct QRegExpEngineKey
     }
 };
 
-bool operator==(const QRegExpEngineKey &key1, const QRegExpEngineKey &key2)
+static bool operator==(const QRegExpEngineKey &key1, const QRegExpEngineKey &key2)
 {
     return key1.pattern == key2.pattern && key1.patternSyntax == key2.patternSyntax
            && key1.cs == key2.cs;
@@ -1261,28 +1261,35 @@ struct QRegExpLookahead
 };
 #endif
 
-QRegExpEngine::QRegExpEngine(const QRegExpEngineKey &key)
-    : cs(key.cs), greedyQuantifiers(key.patternSyntax == QRegExp::RegExp2),
-      xmlSchemaExtensions(false)
-{
-    setup();
-
-    QString rx;
+/*! \internal
+    convert the pattern string to the RegExp syntax.
 
-    switch (key.patternSyntax) {
-    case QRegExp::Wildcard:
+    This is also used by QScriptEngine::newRegExp to convert to a pattern that JavaScriptCore can understan
+ */
+Q_CORE_EXPORT QString qt_regexp_toCanonical(const QString &pattern, QRegExp::PatternSyntax patternSyntax)
+{
+    switch (patternSyntax) {
 #ifndef QT_NO_REGEXP_WILDCARD
-        rx = wc2rx(key.pattern);
-#endif
+    case QRegExp::Wildcard:
+        return wc2rx(pattern);
         break;
+#endif
     case QRegExp::FixedString:
-        rx = QRegExp::escape(key.pattern);
+        return QRegExp::escape(pattern);
         break;
     case QRegExp::W3CXmlSchema11:
-        xmlSchemaExtensions = true;
     default:
-        rx = key.pattern;
+        return pattern;
     }
+}
+
+QRegExpEngine::QRegExpEngine(const QRegExpEngineKey &key)
+    : cs(key.cs), greedyQuantifiers(key.patternSyntax == QRegExp::RegExp2),
+      xmlSchemaExtensions(key.patternSyntax == QRegExp::W3CXmlSchema11)
+{
+    setup();
+
+    QString rx = qt_regexp_toCanonical(key.pattern, key.patternSyntax);
 
     valid = (parse(rx.unicode(), rx.length()) == rx.length());
     if (!valid) {