summaryrefslogtreecommitdiffstats
path: root/doc/src/snippets
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2011-04-12 02:35:28 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2011-04-12 02:35:28 (GMT)
commitb6f1dd4151c5bbcb7d4367ec972c9026ab9e68be (patch)
treeb9c4adba9bf64a3f8f62d1b1299f5083f3896ea2 /doc/src/snippets
parent4889729b32b30a4bad90a0add8ca444529dea2e7 (diff)
parentf2219ce983098fc14655d8f3bb8a7fee2c9abe4d (diff)
downloadQt-b6f1dd4151c5bbcb7d4367ec972c9026ab9e68be.zip
Qt-b6f1dd4151c5bbcb7d4367ec972c9026ab9e68be.tar.gz
Qt-b6f1dd4151c5bbcb7d4367ec972c9026ab9e68be.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: Allow enum values to be used as signal parameters ListModel::clear() should not clear roles
Diffstat (limited to 'doc/src/snippets')
-rw-r--r--doc/src/snippets/declarative/qtbinding/enums/standalone.qml15
1 files changed, 15 insertions, 0 deletions
diff --git a/doc/src/snippets/declarative/qtbinding/enums/standalone.qml b/doc/src/snippets/declarative/qtbinding/enums/standalone.qml
index 5721870..74e2c9c 100644
--- a/doc/src/snippets/declarative/qtbinding/enums/standalone.qml
+++ b/doc/src/snippets/declarative/qtbinding/enums/standalone.qml
@@ -38,6 +38,9 @@
**
****************************************************************************/
import MyLibrary 1.0
+import QtQuick 1.0
+
+Item {
//![0]
ImageViewer {
@@ -47,3 +50,15 @@ ImageViewer {
}
}
//![0]
+
+//![1]
+ImageViewer {
+ signal someOtherSignal(int statusValue)
+
+ Component.onCompleted: {
+ someOtherSignal(ImageViewer.Loading)
+ }
+}
+//![1]
+
+}