diff options
| author | Frans Englich <frans.englich@nokia.com> | 2009-09-30 13:11:39 (GMT) |
|---|---|---|
| committer | Frans Englich <frans.englich@nokia.com> | 2009-09-30 13:11:39 (GMT) |
| commit | 7c33e0f95789af1f6c091db89581f8a26b10682d (patch) | |
| tree | cb8faa2ab6ce19c85a8c0c90dc852db08375868e /src/script/api/qscriptengine.cpp | |
| parent | da935e9df4c63490a7d2a716236f1e781c2d75a6 (diff) | |
| parent | c3ef2d3a6d9a6e35b05cbd8f370630d5dd85415e (diff) | |
| download | Qt-7c33e0f95789af1f6c091db89581f8a26b10682d.zip Qt-7c33e0f95789af1f6c091db89581f8a26b10682d.tar.gz Qt-7c33e0f95789af1f6c091db89581f8a26b10682d.tar.bz2 | |
Merge commit 'origin/4.6' into mmfphonon
Diffstat (limited to 'src/script/api/qscriptengine.cpp')
| -rw-r--r-- | src/script/api/qscriptengine.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/script/api/qscriptengine.cpp b/src/script/api/qscriptengine.cpp index ee25239..9604fff 100644 --- a/src/script/api/qscriptengine.cpp +++ b/src/script/api/qscriptengine.cpp @@ -1606,6 +1606,9 @@ QScriptValue QScriptEngine::newFunction(QScriptEngine::FunctionSignature fun, } #ifndef QT_NO_REGEXP + +extern QString qt_regexp_toCanonical(const QString &, QRegExp::PatternSyntax); + /*! Creates a QtScript object of class RegExp with the given \a regexp. @@ -1620,7 +1623,6 @@ QScriptValue QScriptEngine::newRegExp(const QRegExp ®exp) JSC::ArgList args(buf, sizeof(buf)); //convert the pattern to a ECMAScript pattern - extern QString qt_regexp_toCanonical(const QString &, QRegExp::PatternSyntax); QString pattern = qt_regexp_toCanonical(regexp.pattern(), regexp.patternSyntax()); if (regexp.isMinimal()) { QString ecmaPattern; |