diff options
| author | Martin Jones <martin.jones@nokia.com> | 2010-07-19 01:32:27 (GMT) |
|---|---|---|
| committer | Martin Jones <martin.jones@nokia.com> | 2010-07-19 01:32:27 (GMT) |
| commit | e2cb220eb67455f1041cf8ac863a5da4421ab424 (patch) | |
| tree | 830302d9d445e2c071afe59ff7bef0f0664440f5 /examples/declarative | |
| parent | 5572ec653fe735c4f413195c1ef34382aa8c6105 (diff) | |
| parent | 53d3083eecf88a20bc36ada43942c7a18677af62 (diff) | |
| download | Qt-e2cb220eb67455f1041cf8ac863a5da4421ab424.zip Qt-e2cb220eb67455f1041cf8ac863a5da4421ab424.tar.gz Qt-e2cb220eb67455f1041cf8ac863a5da4421ab424.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7
Diffstat (limited to 'examples/declarative')
| -rw-r--r-- | examples/declarative/modelviews/abstractitemmodel/model.cpp | 2 | ||||
| -rw-r--r-- | examples/declarative/tutorials/samegame/samegame1/samegame.qml | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/examples/declarative/modelviews/abstractitemmodel/model.cpp b/examples/declarative/modelviews/abstractitemmodel/model.cpp index d0e0971..940a44d 100644 --- a/examples/declarative/modelviews/abstractitemmodel/model.cpp +++ b/examples/declarative/modelviews/abstractitemmodel/model.cpp @@ -67,7 +67,9 @@ AnimalModel::AnimalModel(QObject *parent) void AnimalModel::addAnimal(const Animal &animal) { + beginInsertRows(QModelIndex(), rowCount(), rowCount()); m_animals << animal; + endInsertRows(); } int AnimalModel::rowCount(const QModelIndex & parent) const { diff --git a/examples/declarative/tutorials/samegame/samegame1/samegame.qml b/examples/declarative/tutorials/samegame/samegame1/samegame.qml index 68f8712..80567ef 100644 --- a/examples/declarative/tutorials/samegame/samegame1/samegame.qml +++ b/examples/declarative/tutorials/samegame/samegame1/samegame.qml @@ -55,7 +55,7 @@ Rectangle { Image { id: background anchors.fill: parent - source: "../shared/pics/background.jpg" + source: "../shared/pics/background.png" fillMode: Image.PreserveAspectCrop } } |