diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-07-03 05:57:19 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-07-03 05:57:19 (GMT) |
| commit | b68a5d2cd6b08504b354b09465ab05593120fee8 (patch) | |
| tree | 813f65cf0a9e9207e35611072b6927a3b0f7b97e /src/imports | |
| parent | daeb81493aef4fd8f632ba4ea7f8d12ed80fa7be (diff) | |
| parent | 80de59a2f0289d3f7bbef405ed2175a64faabc96 (diff) | |
| download | Qt-b68a5d2cd6b08504b354b09465ab05593120fee8.zip Qt-b68a5d2cd6b08504b354b09465ab05593120fee8.tar.gz Qt-b68a5d2cd6b08504b354b09465ab05593120fee8.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:
Don't write to the logger widget while the application is closing down.
Fix exponential behavior of QTextCursor::removeSelectedText
Fix test for N900 (ARM-specific SVG results).
docs - fix doc links, minor improvements
Fix TextEdit bitmap tests testing the wrong element
Make autotests work with qreal == float (in addition to double).
Fix TextInput text getting improperly clipped
fix doc links
Fix docs to link to the new QML Viewer page instead of the Runtime page
qmlviewer: Update the proxy factory when the user changes the proxy.
Don't accept *files* that exist when *directory* is required.
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 e5647bd..243ba0f 100644 --- a/src/imports/gestures/qdeclarativegesturearea.cpp +++ b/src/imports/gestures/qdeclarativegesturearea.cpp @@ -130,7 +130,7 @@ public: GestureArea is an invisible item: it is never painted. - \sa Gesture, MouseArea, {declarative/touchinteraction/gestures}{Gestures example} + \sa MouseArea, {declarative/touchinteraction/gestures}{Gestures example} */ /*! |