diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-06-08 16:32:12 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-06-08 16:32:12 (GMT) |
| commit | bb8b5d7005a1125fd677b32f3381e9b64f0857ff (patch) | |
| tree | 5cfa6c2c042f6968f9b506ef778b1778e0690b72 /src/script/api/qscriptengine.cpp | |
| parent | 2ae808a23ce05bf9768ad9df107c16bb0c555ee7 (diff) | |
| parent | a0dc2b8344e2a24d78d5648bfb0f9f76bca37ca9 (diff) | |
| download | Qt-bb8b5d7005a1125fd677b32f3381e9b64f0857ff.zip Qt-bb8b5d7005a1125fd677b32f3381e9b64f0857ff.tar.gz Qt-bb8b5d7005a1125fd677b32f3381e9b64f0857ff.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
QVarLenghtArray: Add typedefs for stl compatibility.
prefer QElapsedTimer over QTime
Allow to build Qt in static with mingw
Protected call to glXChooseFBConfig with appropriate defines.
Use the new OpenGL 3.* context/profile if asked with X11/GLX.
Splitted attrib_list generation into buildSpec from QGLContext::tryVisual.
Fix QTransform::map(const QPainterPath &) not working with paths that
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. |