diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-10-19 19:20:53 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-10-19 19:20:53 (GMT) |
| commit | 70f7a6e7ebec1fca9087fde56ce9961f34a52dc5 (patch) | |
| tree | 99cf40a280fdc3b5dc252e7c5311a17fdb09582e /demos | |
| parent | c849ddd06371e5a6455c63d67a14171ac06bf9d4 (diff) | |
| parent | ed1212be97e632b7716d8a2eb3f9b0efbd001627 (diff) | |
| download | Qt-70f7a6e7ebec1fca9087fde56ce9961f34a52dc5.zip Qt-70f7a6e7ebec1fca9087fde56ce9961f34a52dc5.tar.gz Qt-70f7a6e7ebec1fca9087fde56ce9961f34a52dc5.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:
Tic-tac-toe: Fix z-order of status text.
Don't export QtDeclarative symbols needed by QtCreator on Symbian
Properties take precedence over methods
Call the correct vme meta object when connecting alias signals
Fix Twitter demo's list view for devices
Fix QDeclarativeTextLayout under non-affine transformation
Fix visual tests.
ListView.visibleArea.heightRatio should not emit a signal when it does not change.
Properties should have precedence over methods.
Diffstat (limited to 'demos')
| -rw-r--r-- | demos/declarative/twitter/twitter.qml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/demos/declarative/twitter/twitter.qml b/demos/declarative/twitter/twitter.qml index 4495523..74bab37 100644 --- a/demos/declarative/twitter/twitter.qml +++ b/demos/declarative/twitter/twitter.qml @@ -78,7 +78,7 @@ Item { id: views x: 2; width: parent.width - 4 y:60 //Below the title bars - height: 380 + height: parent.height - 100 Text { id:title |