diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-06-11 17:43:06 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-06-11 17:43:06 (GMT) |
| commit | 12655c23263d5b6ca11ab6c05cb990c436d47cc0 (patch) | |
| tree | 2253c0e888231e1e2955f3337a853d11bd01f7a3 /src/script/api/qscriptengine.cpp | |
| parent | e6dedd0e1b3708de278f42bbcfffda5ffbe00da2 (diff) | |
| parent | e311bd0b23cf8696f284b8da3dcc5a591c7b689e (diff) | |
| download | Qt-12655c23263d5b6ca11ab6c05cb990c436d47cc0.zip Qt-12655c23263d5b6ca11ab6c05cb990c436d47cc0.tar.gz Qt-12655c23263d5b6ca11ab6c05cb990c436d47cc0.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Allow to build Qt in static with mingw
Diffstat (limited to 'src/script/api/qscriptengine.cpp')
| -rw-r--r-- | src/script/api/qscriptengine.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/script/api/qscriptengine.cpp b/src/script/api/qscriptengine.cpp index f44f33d..fe12fc8 100644 --- a/src/script/api/qscriptengine.cpp +++ b/src/script/api/qscriptengine.cpp @@ -1603,7 +1603,7 @@ QScriptValue QScriptEngine::newFunction(QScriptEngine::FunctionSignature fun, #ifndef QT_NO_REGEXP -Q_DECL_IMPORT extern QString qt_regexp_toCanonical(const QString &, QRegExp::PatternSyntax); +Q_CORE_EXPORT QString qt_regexp_toCanonical(const QString &, QRegExp::PatternSyntax); /*! Creates a QtScript object of class RegExp with the given |