diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-04-15 17:26:48 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-04-15 17:26:48 (GMT) |
| commit | 7dc1b7b7506b5ba88bccb98ebb38007e2f055336 (patch) | |
| tree | 96b06c06062fe6aa03376a4ea5d369259d2ab800 /src/script/api/qscriptengine.cpp | |
| parent | de1c505ddb5acedf96168df00172b9e3a694a32d (diff) | |
| parent | 81837e43e3f966c1755e90eb65df6e3bad506ed7 (diff) | |
| download | Qt-7dc1b7b7506b5ba88bccb98ebb38007e2f055336.zip Qt-7dc1b7b7506b5ba88bccb98ebb38007e2f055336.tar.gz Qt-7dc1b7b7506b5ba88bccb98ebb38007e2f055336.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:
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 |