diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-04-15 21:19:45 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-04-15 21:19:45 (GMT) |
| commit | 4ebc4ab2fa98d3433292b07e7022892c9549e700 (patch) | |
| tree | ba7eb3c3232d0435fffa1da0269f8c9925c95edb /src/script/api/qscriptengine.cpp | |
| parent | 0398173542384f1600e1652bbb6449fe735b9359 (diff) | |
| parent | 1933243f68f33c3f5986bad87da734e574bc188e (diff) | |
| download | Qt-4ebc4ab2fa98d3433292b07e7022892c9549e700.zip Qt-4ebc4ab2fa98d3433292b07e7022892c9549e700.tar.gz Qt-4ebc4ab2fa98d3433292b07e7022892c9549e700.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Update EABI and BWINS DEF files for Symbian
Update WebKit DEF files on Symbian
Symbol visibility fixes for RVCT4 on Symbian
Symbol visibility fixes for RVCT4 on Symbian
Symbol visibility fixes for RVCT4 on Symbian
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 9ce0f7d..f44f33d 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 -extern QString qt_regexp_toCanonical(const QString &, QRegExp::PatternSyntax); +Q_DECL_IMPORT extern QString qt_regexp_toCanonical(const QString &, QRegExp::PatternSyntax); /*! Creates a QtScript object of class RegExp with the given |