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 /demos/declarative/flickr/common/qmldir | |
| 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 'demos/declarative/flickr/common/qmldir')
| -rw-r--r-- | demos/declarative/flickr/common/qmldir | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/demos/declarative/flickr/common/qmldir b/demos/declarative/flickr/common/qmldir index 0c94f60..adc2479 100644 --- a/demos/declarative/flickr/common/qmldir +++ b/demos/declarative/flickr/common/qmldir @@ -1,10 +1,10 @@ -ImageDetails 0.0 ImageDetails.qml -LikeOMeter 0.0 LikeOMeter.qml -Loading 0.0 Loading.qml -MediaButton 0.0 MediaButton.qml -MediaLineEdit 0.0 MediaLineEdit.qml -Progress 0.0 Progress.qml -RssModel 0.0 RssModel.qml -ScrollBar 0.0 ScrollBar.qml -Slider 0.0 Slider.qml -Star 0.0 Star.qml +ImageDetails ImageDetails.qml +LikeOMeter LikeOMeter.qml +Loading Loading.qml +MediaButton MediaButton.qml +MediaLineEdit MediaLineEdit.qml +Progress Progress.qml +RssModel RssModel.qml +ScrollBar ScrollBar.qml +Slider Slider.qml +Star Star.qml |