diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-06-10 01:35:03 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-06-10 01:35:03 (GMT) |
| commit | d0721276513102902fbfd839bf1af24dc0a4b1d7 (patch) | |
| tree | 48b5588d19ed78ce3bb21ebe93d7e32d43f7c5c8 /src/script/api/qscriptengine.cpp | |
| parent | 9fc91de560b1302ff6cf238b3d179fc778066fcf (diff) | |
| parent | 1abf2d6dfafc71f73746b7e69e11e0c8152edb4a (diff) | |
| download | Qt-d0721276513102902fbfd839bf1af24dc0a4b1d7.zip Qt-d0721276513102902fbfd839bf1af24dc0a4b1d7.tar.gz Qt-d0721276513102902fbfd839bf1af24dc0a4b1d7.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: (23 commits)
Rename QLocale::isWrittenRightToLeft() to textDirection()
Fixed some bugs in detection of keyboard directionality
Add a isWrittenRightToLeft() method to QLocale.
consistent handling of directionality in QTextLayout
For an empty line edit the cursor position is depending on input language
correctly initialize the bidi level in the text engine
Use the textDirection() of blocks correctly.
Add QTextBlock::textDirection()
Make sure LayoutDirectionAuto is the default text direction
LayoutDirectionAuto is the default layout direction for QPainter
Correct BiDi behavior of QLineEdit
The default text direction for QTextOption is Qt::LayoutDirectionAuto
Handle setting the layoutDirection to Qt::LayoutDirectionAuto
Introduce LayoutDirection Qt::LayoutDirectionAuto
Fix QString::isRightToLeft() to conform with Unicode Bidi algorithm
small optimisation
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.
...
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. |