diff options
| author | Alan Alpert <alan.alpert@nokia.com> | 2010-06-15 07:50:47 (GMT) |
|---|---|---|
| committer | Alan Alpert <alan.alpert@nokia.com> | 2010-06-15 07:50:47 (GMT) |
| commit | 45d9575a8c680206cdea0519b03996b6b8085294 (patch) | |
| tree | d156b7d5c2dc0633c4468dce4cae4f0daf9e0035 /src/script/api/qscriptengine.cpp | |
| parent | 01506a3b212d449d65df1131b49af0e174e45275 (diff) | |
| parent | c1e6d97b9476c859abc3927046144b4006fcf735 (diff) | |
| download | Qt-45d9575a8c680206cdea0519b03996b6b8085294.zip Qt-45d9575a8c680206cdea0519b03996b6b8085294.tar.gz Qt-45d9575a8c680206cdea0519b03996b6b8085294.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7
Diffstat (limited to 'src/script/api/qscriptengine.cpp')
| -rw-r--r-- | src/script/api/qscriptengine.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/script/api/qscriptengine.cpp b/src/script/api/qscriptengine.cpp index 86915bb..f02ea52 100644 --- a/src/script/api/qscriptengine.cpp +++ b/src/script/api/qscriptengine.cpp @@ -1525,7 +1525,7 @@ void QScriptEnginePrivate::detachAllRegisteredScriptStrings() #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); JSC::JSValue QScriptEnginePrivate::newRegExp(JSC::ExecState *exec, const QRegExp ®exp) { @@ -2020,8 +2020,6 @@ QScriptValue QScriptEngine::newFunction(QScriptEngine::FunctionSignature fun, #ifndef QT_NO_REGEXP -Q_DECL_IMPORT extern QString qt_regexp_toCanonical(const QString &, QRegExp::PatternSyntax); - /*! Creates a QtScript object of class RegExp with the given \a regexp. |