diff options
| author | Olivier Goffart <olivier.goffart@nokia.com> | 2011-03-03 15:34:32 (GMT) |
|---|---|---|
| committer | Olivier Goffart <olivier.goffart@nokia.com> | 2011-03-03 15:34:32 (GMT) |
| commit | 8ddf96a15f707001755d5b934f3f900b825b5887 (patch) | |
| tree | 5dee68c5bd2e691218bd45c7b74da7c7c16b22cd /src/imports | |
| parent | 5414957f0feebe24a2aa0ac7c5ec32e53e49b57a (diff) | |
| parent | d7a00eaec6d94fd2383d6f815f792d26b7161f0c (diff) | |
| download | Qt-8ddf96a15f707001755d5b934f3f900b825b5887.zip Qt-8ddf96a15f707001755d5b934f3f900b825b5887.tar.gz Qt-8ddf96a15f707001755d5b934f3f900b825b5887.tar.bz2 | |
Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7
Conflicts:
src/openvg/qvg_symbian.cpp
src/s60installs/bwins/QtGuiu.def
src/s60installs/eabi/QtGuiu.def
Diffstat (limited to 'src/imports')
| -rw-r--r-- | src/imports/gestures/qdeclarativegesturearea.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/imports/gestures/qdeclarativegesturearea.cpp b/src/imports/gestures/qdeclarativegesturearea.cpp index 1b6e723..c2a2e98 100644 --- a/src/imports/gestures/qdeclarativegesturearea.cpp +++ b/src/imports/gestures/qdeclarativegesturearea.cpp @@ -89,6 +89,10 @@ public: \warning Elements in the Qt.labs module are not guaranteed to remain compatible in future versions. + \warning GestureArea is an experimental element whose development has + been discontinued. PinchArea is available in QtQuick 1.1 and handles + two finger gesture input. + \note This element is only functional on devices with touch input. \qml |