diff options
| author | Aaron Kennedy <aaron.kennedy@nokia.com> | 2010-10-19 04:30:59 (GMT) |
|---|---|---|
| committer | Aaron Kennedy <aaron.kennedy@nokia.com> | 2010-10-19 04:30:59 (GMT) |
| commit | 341831b75166cee713c2d792b81b61f3ae15b8e7 (patch) | |
| tree | 807889b7e0087752c859bb4f8bd9d3fd71b6298e | |
| parent | e92730ceebb4aa96704052236d45938a82c03dd8 (diff) | |
| parent | 77e65b4d9fb537571232e38c9670fcabfb7a93f6 (diff) | |
| download | Qt-341831b75166cee713c2d792b81b61f3ae15b8e7.zip Qt-341831b75166cee713c2d792b81b61f3ae15b8e7.tar.gz Qt-341831b75166cee713c2d792b81b61f3ae15b8e7.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7
| -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 |