diff options
| author | David Boddie <david.boddie@nokia.com> | 2011-02-23 13:20:55 (GMT) |
|---|---|---|
| committer | David Boddie <david.boddie@nokia.com> | 2011-02-23 13:20:55 (GMT) |
| commit | 7a476ac32f2d21fbffa1bcd09101148e15fbc17e (patch) | |
| tree | aee861c1f078b39e17a278612ef4efc72ef2842c /src/imports | |
| parent | 39ed27f1e382fbc594d2e5b6a23b2bc612b96e64 (diff) | |
| parent | 276ae3c231a80b5cf64ae431e9386ac63d48a278 (diff) | |
| download | Qt-7a476ac32f2d21fbffa1bcd09101148e15fbc17e.zip Qt-7a476ac32f2d21fbffa1bcd09101148e15fbc17e.tar.gz Qt-7a476ac32f2d21fbffa1bcd09101148e15fbc17e.tar.bz2 | |
Merge branch 'mimir' into 4.7
Conflicts:
doc/src/declarative/qdeclarativemodels.qdoc
doc/src/index.qdoc
doc/src/template/style/style.css
tools/qdoc3/atom.h
tools/qdoc3/doc.cpp
tools/qdoc3/doc/qdoc-manual.qdoc
tools/qdoc3/doc/qdoc-manual.qdocconf
Diffstat (limited to 'src/imports')
| -rw-r--r-- | src/imports/gestures/qdeclarativegesturearea.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/imports/gestures/qdeclarativegesturearea.cpp b/src/imports/gestures/qdeclarativegesturearea.cpp index 1b6e723..ad44905 100644 --- a/src/imports/gestures/qdeclarativegesturearea.cpp +++ b/src/imports/gestures/qdeclarativegesturearea.cpp @@ -132,7 +132,7 @@ public: GestureArea is an invisible item: it is never painted. - \sa MouseArea, {declarative/touchinteraction/gestures}{Gestures example} + \sa MouseArea */ /*! |