diff options
| author | Jarek Kobus <jkobus@trolltech.com> | 2009-09-30 08:35:59 (GMT) |
|---|---|---|
| committer | Jarek Kobus <jkobus@trolltech.com> | 2009-09-30 08:37:47 (GMT) |
| commit | 9c11d47d3d966bdb2e896e1347e22007c7922893 (patch) | |
| tree | 174c50b37030e1d1f6ff9e6bacb717a16926870d /src/script/api | |
| parent | 4b4bea046f3a7e26f1c4bff97065a06b2d7f9dc1 (diff) | |
| download | Qt-9c11d47d3d966bdb2e896e1347e22007c7922893.zip Qt-9c11d47d3d966bdb2e896e1347e22007c7922893.tar.gz Qt-9c11d47d3d966bdb2e896e1347e22007c7922893.tar.bz2 | |
Fix linking on windows, building qt in namespace
RevBy: Thiago Macieira <thiago.macieira@trolltech.com>
Diffstat (limited to 'src/script/api')
| -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; |