diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-03-15 17:00:07 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-03-15 17:00:07 (GMT) |
| commit | 737c0c8d9aa319384ef0bcbed4e709deb2239e75 (patch) | |
| tree | 4776d0ff27ed18e57c298f1ac99a9c57a0d5eea6 /tests/auto/declarative/qdeclarativepathview/data/pathview3.qml | |
| parent | 33c6983a19942c151fa0bcc878b5219e0b641ba9 (diff) | |
| parent | 83fe3a8e1f12ddfb6fc8d42f007816c122bed94d (diff) | |
| download | Qt-737c0c8d9aa319384ef0bcbed4e709deb2239e75.zip Qt-737c0c8d9aa319384ef0bcbed4e709deb2239e75.tar.gz Qt-737c0c8d9aa319384ef0bcbed4e709deb2239e75.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: (89 commits)
Compile with user defined Qt namespace
Fix regression from previous commit
Import "content" with as qualifier to support network without qmldir
Small fixes to photoviewer demo
Fix benchmark.
Add basic QUrl benchmarks.
Add busy indicator to photoviewer demo
Set maximumExtents correctly for highlightRangeMode: StrictlyEnforceRange
fix installation of imports libraries
QDeclarative::isWritable optimization.
Make easing docs more consistent with other grouped property docs.
Make the loader a focusscope.
Fix typo.
Use reliable local server for HTTP testing.
Fix installation of imports libraries
Change PathView offset property to use range 0 - 1.0
Tweak benchmark
Optimization: Use linked list for context children
Add new declarative photoviewer demo
Remove dead code
...
Diffstat (limited to 'tests/auto/declarative/qdeclarativepathview/data/pathview3.qml')
| -rw-r--r-- | tests/auto/declarative/qdeclarativepathview/data/pathview3.qml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/auto/declarative/qdeclarativepathview/data/pathview3.qml b/tests/auto/declarative/qdeclarativepathview/data/pathview3.qml index f8ed29f..70cfbcd 100644 --- a/tests/auto/declarative/qdeclarativepathview/data/pathview3.qml +++ b/tests/auto/declarative/qdeclarativepathview/data/pathview3.qml @@ -2,7 +2,7 @@ import Qt 4.6 PathView { id: photoPathView - y: 100; width: 800; height: 330; pathItemCount: 4; offset: 10 + y: 100; width: 800; height: 330; pathItemCount: 4; offset: 0.1 dragMargin: 24; snapPosition: 0.50 path: Path { |