summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBea Lam <bea.lam@nokia.com>2010-06-11 14:59:09 +1000
committerBea Lam <bea.lam@nokia.com>2010-06-11 15:36:51 +1000
commitf0bb05cb7e85715d8a47c5d1ddd603edc6959c20 (patch)
treeffe3ecd0d2a09ea423b72c0e4e19e9d8228a6b3a
parentb90283fd887898a3eda62e856bec7f8a34e242ac (diff)
Move listview/itemlist.qml to a separate visualitemmodel example
-rw-r--r--doc/src/declarative/examples.qdoc1
-rw-r--r--doc/src/examples/qml-examples.qdoc7
-rw-r--r--examples/declarative/modelviews/listview/content/pics/add.pngbin1577 -> 0 bytes
-rw-r--r--examples/declarative/modelviews/listview/content/pics/del.pngbin1661 -> 0 bytes
-rw-r--r--examples/declarative/modelviews/listview/content/pics/trash.pngbin989 -> 0 bytes
-rw-r--r--examples/declarative/modelviews/listview/dynamiclist.qml (renamed from examples/declarative/modelviews/listview/dynamic.qml)0
-rw-r--r--examples/declarative/modelviews/listview/expandingdelegates.qml (renamed from examples/declarative/modelviews/listview/recipes.qml)0
-rw-r--r--examples/declarative/modelviews/listview/highlightranges.qml (renamed from examples/declarative/modelviews/listview/listview-example.qml)0
-rw-r--r--examples/declarative/modelviews/visualitemmodel/visualitemmodel.qml (renamed from examples/declarative/modelviews/listview/itemlist.qml)0
-rw-r--r--examples/declarative/modelviews/visualitemmodel/visualitemmodel.qmlproject16
-rw-r--r--src/declarative/graphicsitems/qdeclarativevisualitemmodel.cpp2
11 files changed, 26 insertions, 0 deletions
diff --git a/doc/src/declarative/examples.qdoc b/doc/src/declarative/examples.qdoc
index cc67664435..ad8c10ccf1 100644
--- a/doc/src/declarative/examples.qdoc
+++ b/doc/src/declarative/examples.qdoc
@@ -118,6 +118,7 @@ For example, from your build directory, run:
\o \l{declarative/modelviews/package}{Package}
\o \l{declarative/modelviews/parallax}{Parallax}
\o \l{declarative/modelviews/stringlistmodel}{String ListModel}
+\o \l{declarative/modelviews/visualitemmodel}{VisualItemModel}
\o \l{declarative/modelviews/webview}{WebView}
\endlist
diff --git a/doc/src/examples/qml-examples.qdoc b/doc/src/examples/qml-examples.qdoc
index 9dbf853ccd..b6069f20d8 100644
--- a/doc/src/examples/qml-examples.qdoc
+++ b/doc/src/examples/qml-examples.qdoc
@@ -247,6 +247,13 @@
*/
/*!
+ \title Models and Views: VisualItemModel
+ \example declarative/modelviews/visualitemmodel
+
+ This example shows how to use the VisualItemModel element.
+*/
+
+/*!
\title Models and Views: WebView
\example declarative/modelviews/webview
diff --git a/examples/declarative/modelviews/listview/content/pics/add.png b/examples/declarative/modelviews/listview/content/pics/add.png
deleted file mode 100644
index f29d84b492..0000000000
--- a/examples/declarative/modelviews/listview/content/pics/add.png
+++ /dev/null
Binary files differ
diff --git a/examples/declarative/modelviews/listview/content/pics/del.png b/examples/declarative/modelviews/listview/content/pics/del.png
deleted file mode 100644
index 1d753a3bc5..0000000000
--- a/examples/declarative/modelviews/listview/content/pics/del.png
+++ /dev/null
Binary files differ
diff --git a/examples/declarative/modelviews/listview/content/pics/trash.png b/examples/declarative/modelviews/listview/content/pics/trash.png
deleted file mode 100644
index 20425957a5..0000000000
--- a/examples/declarative/modelviews/listview/content/pics/trash.png
+++ /dev/null
Binary files differ
diff --git a/examples/declarative/modelviews/listview/dynamic.qml b/examples/declarative/modelviews/listview/dynamiclist.qml
index df2e094281..df2e094281 100644
--- a/examples/declarative/modelviews/listview/dynamic.qml
+++ b/examples/declarative/modelviews/listview/dynamiclist.qml
diff --git a/examples/declarative/modelviews/listview/recipes.qml b/examples/declarative/modelviews/listview/expandingdelegates.qml
index f4b97eac32..f4b97eac32 100644
--- a/examples/declarative/modelviews/listview/recipes.qml
+++ b/examples/declarative/modelviews/listview/expandingdelegates.qml
diff --git a/examples/declarative/modelviews/listview/listview-example.qml b/examples/declarative/modelviews/listview/highlightranges.qml
index a8a95c4708..a8a95c4708 100644
--- a/examples/declarative/modelviews/listview/listview-example.qml
+++ b/examples/declarative/modelviews/listview/highlightranges.qml
diff --git a/examples/declarative/modelviews/listview/itemlist.qml b/examples/declarative/modelviews/visualitemmodel/visualitemmodel.qml
index 1b44e05266..1b44e05266 100644
--- a/examples/declarative/modelviews/listview/itemlist.qml
+++ b/examples/declarative/modelviews/visualitemmodel/visualitemmodel.qml
diff --git a/examples/declarative/modelviews/visualitemmodel/visualitemmodel.qmlproject b/examples/declarative/modelviews/visualitemmodel/visualitemmodel.qmlproject
new file mode 100644
index 0000000000..d4909f8685
--- /dev/null
+++ b/examples/declarative/modelviews/visualitemmodel/visualitemmodel.qmlproject
@@ -0,0 +1,16 @@
+import QmlProject 1.0
+
+Project {
+ /* Include .qml, .js, and image files from current directory and subdirectories */
+ QmlFiles {
+ directory: "."
+ }
+ JavaScriptFiles {
+ directory: "."
+ }
+ ImageFiles {
+ directory: "."
+ }
+ /* List of plugin directories passed to QML runtime */
+ // importPaths: [ " ../exampleplugin " ]
+}
diff --git a/src/declarative/graphicsitems/qdeclarativevisualitemmodel.cpp b/src/declarative/graphicsitems/qdeclarativevisualitemmodel.cpp
index 410f526cc9..5092349eed 100644
--- a/src/declarative/graphicsitems/qdeclarativevisualitemmodel.cpp
+++ b/src/declarative/graphicsitems/qdeclarativevisualitemmodel.cpp
@@ -141,6 +141,8 @@ public:
\endcode
\image visualitemmodel.png
+
+ \sa {declarative/modelviews/visualitemmodel}{VisualItemModel example}
*/
QDeclarativeVisualItemModel::QDeclarativeVisualItemModel(QObject *parent)
: QDeclarativeVisualModel(*(new QDeclarativeVisualItemModelPrivate), parent)