diff options
| author | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2010-05-17 08:20:30 (GMT) |
|---|---|---|
| committer | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2010-05-17 08:20:30 (GMT) |
| commit | 4d4cb1023d693a2a4130e032c8894e0f56250f93 (patch) | |
| tree | 24e3db8d63b7149b81c3b509fb5b820caf7ecbff /doc/src/snippets | |
| parent | 8fe40ca28e88d156b9a0ef9cc4c818a666499231 (diff) | |
| parent | bdbe09ad2c01ae11d10511b51f8d7a3dfb27b17c (diff) | |
| download | Qt-4d4cb1023d693a2a4130e032c8894e0f56250f93.zip Qt-4d4cb1023d693a2a4130e032c8894e0f56250f93.tar.gz Qt-4d4cb1023d693a2a4130e032c8894e0f56250f93.tar.bz2 | |
Merge commit 'qt/4.7' into 4.7
Conflicts:
tests/benchmarks/declarative/binding/binding.pro
tests/benchmarks/declarative/creation/creation.pro
tests/benchmarks/declarative/creation/tst_creation.cpp
tests/benchmarks/declarative/qdeclarativecomponent/qdeclarativecomponent.pro
tests/benchmarks/declarative/qdeclarativeimage/tst_qdeclarativeimage.cpp
tests/benchmarks/declarative/qdeclarativemetaproperty/qdeclarativemetaproperty.pro
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 1d3df97..cf345aa 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 viewer automatically loads files in dummydata/* to assist + // The launcher 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 794b3f2..1282f8d 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 viewer automatically loads files in dummydata/* to assist + // The launcher 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 61bf126..44f0540 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 viewer automatically loads files in dummydata/* to assist + // The launcher automatically loads files in dummydata/* to assist // development without a real data source. // Define a delegate component. A component will be |