diff options
| author | Sami Merilä <sami.merila@nokia.com> | 2009-09-30 09:24:26 (GMT) |
|---|---|---|
| committer | Sami Merilä <sami.merila@nokia.com> | 2009-09-30 09:24:26 (GMT) |
| commit | 256278b886252e1b455ea9faa697592cbedcd85d (patch) | |
| tree | 3d9768c2e413da1f86d367641f5167d31dd1c36a /src/script/api/qscriptengine.cpp | |
| parent | 7171983e8c9ca106952ecc09e540da4aab8b8b0d (diff) | |
| parent | f16330e8d7f0e15d79b17a162a77044da57bb748 (diff) | |
| download | Qt-256278b886252e1b455ea9faa697592cbedcd85d.zip Qt-256278b886252e1b455ea9faa697592cbedcd85d.tar.gz Qt-256278b886252e1b455ea9faa697592cbedcd85d.tar.bz2 | |
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6
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; |