summaryrefslogtreecommitdiffstats
path: root/src/declarative
diff options
context:
space:
mode:
authorJerome Pasion <jerome.pasion@nokia.com>2011-02-15 11:20:37 (GMT)
committerJerome Pasion <jerome.pasion@nokia.com>2011-02-15 11:20:37 (GMT)
commit3a20058dee330b77d4b906695343d643077fa999 (patch)
tree93f35d95c0f2966556452a299822f499b4cdedae /src/declarative
parente61abd249d4148c05b6c24ff787ff98978bbc2f9 (diff)
parentbb9b7f0517abb92ec5ed8b293f0b56a751718096 (diff)
downloadQt-3a20058dee330b77d4b906695343d643077fa999.zip
Qt-3a20058dee330b77d4b906695343d643077fa999.tar.gz
Qt-3a20058dee330b77d4b906695343d643077fa999.tar.bz2
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7
Diffstat (limited to 'src/declarative')
-rw-r--r--src/declarative/util/qdeclarativeconnections.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/declarative/util/qdeclarativeconnections.cpp b/src/declarative/util/qdeclarativeconnections.cpp
index 5a66aab..83a7d83 100644
--- a/src/declarative/util/qdeclarativeconnections.cpp
+++ b/src/declarative/util/qdeclarativeconnections.cpp
@@ -117,6 +117,8 @@ public:
id: area
}
// ...
+ \endqml
+ \qml
Connections {
target: area
onClicked: foo(parameters)