diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-03-17 13:44:16 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-03-17 13:44:16 (GMT) |
| commit | b3cddbcf92a20585fd6fcd0a6c200c5e94b8669f (patch) | |
| tree | e476d17d94feb127f6e34fa46cfde4b763d50f77 /demos/declarative/declarative.pro | |
| parent | 4c1f54097a1fb1acff817ba8caa8af347ae56cd2 (diff) | |
| parent | ca8231566ac3804e479502d082871ab8ca28b8bb (diff) | |
| download | Qt-b3cddbcf92a20585fd6fcd0a6c200c5e94b8669f.zip Qt-b3cddbcf92a20585fd6fcd0a6c200c5e94b8669f.tar.gz Qt-b3cddbcf92a20585fd6fcd0a6c200c5e94b8669f.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: (132 commits)
Fix auto test
Fix type lookup with url
Fix default values on Textinput
Add an implicit import "." to types loaded from a local url
Fix crash
Don't use Qt3 support methods.
Crash
Add/delete albums in photoviewer.
Emits itemsRemoved() in QDeclarativeListModel::remove.
Readd the itemtree benchmarks for comparison purposes.
Allow enum constants as list element properties.
Compile
Cleanup benchmark a little
Really fix warning.
Fix warnings.
MouseArea works now with any QGraphicsObject
Make states test work with smaller font size.
Register QGraphicsWidget type.
Add ListView and GridView.indexAt() methods to get the index at a point.
Tests for default count(), get() values should be run on the worker
...
Diffstat (limited to 'demos/declarative/declarative.pro')
| -rw-r--r-- | demos/declarative/declarative.pro | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/demos/declarative/declarative.pro b/demos/declarative/declarative.pro index 4d169e3..aa60db0 100644 --- a/demos/declarative/declarative.pro +++ b/demos/declarative/declarative.pro @@ -8,6 +8,7 @@ SUBDIRS = \ sources.files = \ calculator \ flickr \ + photoviewer \ samegame \ snake \ twitter \ |