diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-03-10 09:37:43 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-03-10 09:37:43 (GMT) |
| commit | d63778ce3942130eb6fdd8ef173ba50ed0f49a5c (patch) | |
| tree | 9372875f01439616e7b45f1f18f5e5d0478e6ba8 /src/s60installs | |
| parent | b18bd68dd05f000c65e33a975bca6bf24dabb8d3 (diff) | |
| parent | af33f9f2e7ec433b81f5c18e3e7395db4a56c5fe (diff) | |
| download | Qt-d63778ce3942130eb6fdd8ef173ba50ed0f49a5c.zip Qt-d63778ce3942130eb6fdd8ef173ba50ed0f49a5c.tar.gz Qt-d63778ce3942130eb6fdd8ef173ba50ed0f49a5c.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: (27 commits)
AnimatedImage does not change progress value
Fix failing tests
Fix line information for dynamic slots in .qml files
Add missing header include missing from the previous commit
Fix horizontal alignment of QTextDocument-based RTL text
The rotation reported by PinchArea should not be in the range -180..180
Revert to previous lineHeight behavior.
Use the text layout bounds calculated by QLayout.
Fix TextInput key navigation for RTL text
Base empty QML editor horizontal alignment on QApplication::keyboardInputDirection()
Include dynamic parenting use cases in layout mirroring autotests
PinchArea example produced incorrect scaling.
Fix documentation talking about old property LayoutMirror::mirror
Reverse horizontal alignment of QML editors when the layout mirroring is enabled
Update QtDeclarative def files
Removal of text alignment layout direction dependency was missing couple of changes
Fix RTL multiline Text drawing
Remove text alignment of empty QML editors following the layout direction
Add a way to query the reading direction of QML editor text
Make sure horizontal QML editor text aligment always returns the actual alignment
...
Diffstat (limited to 'src/s60installs')
| -rw-r--r-- | src/s60installs/bwins/QtDeclarativeu.def | 5 | ||||
| -rw-r--r-- | src/s60installs/eabi/QtDeclarativeu.def | 3 |
2 files changed, 8 insertions, 0 deletions
diff --git a/src/s60installs/bwins/QtDeclarativeu.def b/src/s60installs/bwins/QtDeclarativeu.def index 8b23b63..5490f0d 100644 --- a/src/s60installs/bwins/QtDeclarativeu.def +++ b/src/s60installs/bwins/QtDeclarativeu.def @@ -1888,4 +1888,9 @@ EXPORTS ??1QDeclarativeRefCount@@UAE@XZ @ 1887 NONAME ; QDeclarativeRefCount::~QDeclarativeRefCount(void) ?addref@QDeclarativeRefCount@@QAEXXZ @ 1888 NONAME ; void QDeclarativeRefCount::addref(void) ?release@QDeclarativeRefCount@@QAEXXZ @ 1889 NONAME ; void QDeclarativeRefCount::release(void) + ?resolveLayoutMirror@QDeclarativeItemPrivate@@QAEXXZ @ 1890 NONAME ; void QDeclarativeItemPrivate::resolveLayoutMirror(void) + ?mirrorChange@QDeclarativeItemPrivate@@UAEXXZ @ 1891 NONAME ; void QDeclarativeItemPrivate::mirrorChange(void) + ?setLayoutMirror@QDeclarativeItemPrivate@@QAEX_N@Z @ 1892 NONAME ; void QDeclarativeItemPrivate::setLayoutMirror(bool) + ?setImplicitLayoutMirror@QDeclarativeItemPrivate@@QAEX_N0@Z @ 1893 NONAME ; void QDeclarativeItemPrivate::setImplicitLayoutMirror(bool, bool) + ?isMirrored@QDeclarativeItemPrivate@@QBE_NXZ @ 1894 NONAME ; bool QDeclarativeItemPrivate::isMirrored(void) const diff --git a/src/s60installs/eabi/QtDeclarativeu.def b/src/s60installs/eabi/QtDeclarativeu.def index 130e2d5..2849068 100644 --- a/src/s60installs/eabi/QtDeclarativeu.def +++ b/src/s60installs/eabi/QtDeclarativeu.def @@ -1930,4 +1930,7 @@ EXPORTS _ZN20QDeclarativeRefCountD2Ev @ 1929 NONAME _ZTI20QDeclarativeRefCount @ 1930 NONAME _ZTV20QDeclarativeRefCount @ 1931 NONAME + _ZN23QDeclarativeItemPrivate15setLayoutMirrorEb @ 1932 NONAME + _ZN23QDeclarativeItemPrivate19resolveLayoutMirrorEv @ 1933 NONAME + _ZN23QDeclarativeItemPrivate23setImplicitLayoutMirrorEbb @ 1934 NONAME |