diff options
| author | Warwick Allison <warwick.allison@nokia.com> | 2010-05-19 02:44:07 (GMT) |
|---|---|---|
| committer | Warwick Allison <warwick.allison@nokia.com> | 2010-05-19 02:44:07 (GMT) |
| commit | a0973fe3b88dbef39e42da584e63a210693342ee (patch) | |
| tree | f3edf45c2c9dff62a3f5f1cf9fb3c5762ce7e887 /doc/src/snippets | |
| parent | cd707a865625c7ee0ec836d2a1bdcda847ab0517 (diff) | |
| parent | e007505d8f35c1194caf80ffc4f1e46561ff7be3 (diff) | |
| download | Qt-a0973fe3b88dbef39e42da584e63a210693342ee.zip Qt-a0973fe3b88dbef39e42da584e63a210693342ee.tar.gz Qt-a0973fe3b88dbef39e42da584e63a210693342ee.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7
Conflicts:
src/imports/folderlistmodel/qdeclarativefolderlistmodel.cpp
src/imports/folderlistmodel/qdeclarativefolderlistmodel.h
Diffstat (limited to 'doc/src/snippets')
| -rw-r--r-- | doc/src/snippets/declarative/gridview/gridview.qml | 2 | ||||
| -rw-r--r-- | doc/src/snippets/declarative/listview/highlight.qml | 2 | ||||
| -rw-r--r-- | doc/src/snippets/declarative/listview/listview.qml | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/doc/src/snippets/declarative/gridview/gridview.qml b/doc/src/snippets/declarative/gridview/gridview.qml index cf345aa..1d3df97 100644 --- a/doc/src/snippets/declarative/gridview/gridview.qml +++ b/doc/src/snippets/declarative/gridview/gridview.qml @@ -4,7 +4,7 @@ import Qt 4.7 Rectangle { width: 240; height: 180; color: "white" // ContactModel model is defined in dummydata/ContactModel.qml - // The launcher automatically loads files in dummydata/* to assist + // The viewer automatically loads files in dummydata/* to assist // development without a real data source. // Define a delegate component. A component will be diff --git a/doc/src/snippets/declarative/listview/highlight.qml b/doc/src/snippets/declarative/listview/highlight.qml index 1282f8d..794b3f2 100644 --- a/doc/src/snippets/declarative/listview/highlight.qml +++ b/doc/src/snippets/declarative/listview/highlight.qml @@ -4,7 +4,7 @@ Rectangle { width: 180; height: 200; color: "white" // ContactModel model is defined in dummydata/ContactModel.qml - // The launcher automatically loads files in dummydata/* to assist + // The viewer automatically loads files in dummydata/* to assist // development without a real data source. // Define a delegate component. A component will be diff --git a/doc/src/snippets/declarative/listview/listview.qml b/doc/src/snippets/declarative/listview/listview.qml index 44f0540..61bf126 100644 --- a/doc/src/snippets/declarative/listview/listview.qml +++ b/doc/src/snippets/declarative/listview/listview.qml @@ -5,7 +5,7 @@ Rectangle { width: 180; height: 200; color: "white" // ContactModel model is defined in dummydata/ContactModel.qml - // The launcher automatically loads files in dummydata/* to assist + // The viewer automatically loads files in dummydata/* to assist // development without a real data source. // Define a delegate component. A component will be |