diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-09-22 13:11:41 +0200 |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-09-22 13:11:41 +0200 |
| commit | e9d0019c40dc49144dabacd3ab8436f1c190d5e3 (patch) | |
| tree | a7b8b7eb1d684c7cd9be873f5c44669d7684ce91 /examples | |
| parent | b7ba409b0dabd382876310a6c110a96cf0e3c6bf (diff) | |
| parent | 63c4c0449361ced03838e51d18e1113740f27fa9 (diff) | |
| download | qt4-tools-e9d0019c40dc49144dabacd3ab8436f1c190d5e3.tar.gz | |
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:
Mitigate private header problems in QtCreator by adding semi-private API
Update QtDeclarative def files
Add exports for Bauhaus
Fix corkboards example for smaller screens
Fix easing example having wrong contentHeight
Fix a crash in QDeclarativeVisualDataModel
Small optimization for QDeclarativeVisualDataModel.
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/declarative/animation/easing/easing.qml | 2 | ||||
| -rw-r--r-- | examples/declarative/toys/corkboards/Day.qml | 15 |
2 files changed, 12 insertions, 5 deletions
diff --git a/examples/declarative/animation/easing/easing.qml b/examples/declarative/animation/easing/easing.qml index ffb129d5d2..9349a25cea 100644 --- a/examples/declarative/animation/easing/easing.qml +++ b/examples/declarative/animation/easing/easing.qml @@ -137,7 +137,7 @@ Rectangle { Flickable { anchors.fill: parent - contentHeight: layout.height + contentHeight: layout.height+50 Rectangle { id: titlePane color: "#444444" diff --git a/examples/declarative/toys/corkboards/Day.qml b/examples/declarative/toys/corkboards/Day.qml index f406f7bcf9..3525a5bf5c 100644 --- a/examples/declarative/toys/corkboards/Day.qml +++ b/examples/declarative/toys/corkboards/Day.qml @@ -45,9 +45,16 @@ Component { property variant stickies id: page - width: 840; height: 480 + width: ListView.view.width+40; height: ListView.view.height - Image { source: "cork.jpg" } + + Image { + source: "cork.jpg" + width: page.ListView.view.width + height: page.ListView.view.height + fillMode: Image.PreserveAspectCrop + clip: true + } MouseArea { anchors.fill: parent @@ -65,8 +72,8 @@ Component { Item { id: stickyPage - property int randomX: Math.random() * 500 + 100 - property int randomY: Math.random() * 200 + 50 + property int randomX: Math.random() * (page.ListView.view.width-0.5*stickyImage.width) +100 + property int randomY: Math.random() * (page.ListView.view.height-0.5*stickyImage.height) +50 x: randomX; y: randomY |