diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-06-09 03:01:40 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-06-09 03:01:40 (GMT) |
| commit | 3d4fe3845c0c6f30908001175492c0c3afa50a88 (patch) | |
| tree | 86cff0acf2b07000859904a838ae3a44fa92f0ea /src/script/api/qscriptengine.cpp | |
| parent | e6e173b457d41ea232c30c6582493cb54ee8f7c9 (diff) | |
| parent | bb8b5d7005a1125fd677b32f3381e9b64f0857ff (diff) | |
| download | Qt-3d4fe3845c0c6f30908001175492c0c3afa50a88.zip Qt-3d4fe3845c0c6f30908001175492c0c3afa50a88.tar.gz Qt-3d4fe3845c0c6f30908001175492c0c3afa50a88.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. |