diff options
| author | Nico Vertriest <nico.vertriest@digia.com> | 2014-01-23 16:10:26 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-01-31 16:18:07 +0100 |
| commit | 0b26ad05bbadeef493317c994cc7ccb53b0a612c (patch) | |
| tree | c6d790f47b7a6887fd3341bdda331e02f6a03d99 /src | |
| parent | 14addd2cbbb013a256a2c59d9a5b3ac8ca951e0d (diff) | |
Doc: corrected link/example errors
Update pro files after move gestures folder
Update snippet statements
Corrected path in imagegestures.pro
Task-number: QTBUG-34749
Change-Id: Icc19908914e36507e412ab63bf0cc2809aa48e17
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/opengl/doc/src/qtopengl-examples.qdoc | 2 | ||||
| -rw-r--r-- | src/testlib/doc/src/qttest-index.qdoc | 2 | ||||
| -rw-r--r-- | src/widgets/doc/qtwidgets.qdocconf | 2 | ||||
| -rw-r--r-- | src/widgets/doc/src/gestures.qdoc | 8 |
4 files changed, 7 insertions, 7 deletions
diff --git a/src/opengl/doc/src/qtopengl-examples.qdoc b/src/opengl/doc/src/qtopengl-examples.qdoc index 67c6aa3c0d..694b7ab8b8 100644 --- a/src/opengl/doc/src/qtopengl-examples.qdoc +++ b/src/opengl/doc/src/qtopengl-examples.qdoc @@ -34,7 +34,7 @@ \image opengl-examples.png These examples describe how to use the Qt OpenGL Module. For new code, - please use the OpenGL classes in the \l {Qt GUI Module}. + please use the OpenGL classes in the \l QtGui module. Qt provides support for integration with OpenGL implementations on all diff --git a/src/testlib/doc/src/qttest-index.qdoc b/src/testlib/doc/src/qttest-index.qdoc index 4cf0726429..8dc51f8696 100644 --- a/src/testlib/doc/src/qttest-index.qdoc +++ b/src/testlib/doc/src/qttest-index.qdoc @@ -56,7 +56,7 @@ \list \li \l{Qt Test C++ Classes}{C++ Classes} - \li \l{Qt Quick Test}{QML Types} + \li \l{Qt Quick Test QML Types}{QML Types} \endlist */ diff --git a/src/widgets/doc/qtwidgets.qdocconf b/src/widgets/doc/qtwidgets.qdocconf index b742856892..508a257fa5 100644 --- a/src/widgets/doc/qtwidgets.qdocconf +++ b/src/widgets/doc/qtwidgets.qdocconf @@ -27,7 +27,7 @@ qhp.QtWidgets.subprojects.classes.sortPages = true tagfile = ../../../doc/qtwidgets/qtwidgets.tags -depends += qtcore qtgui qtdoc qtsql qtdesigner +depends += qtcore qtgui qtdoc qtsql qtdesigner qtquick headerdirs += .. diff --git a/src/widgets/doc/src/gestures.qdoc b/src/widgets/doc/src/gestures.qdoc index ed7e78ec5a..9126152c42 100644 --- a/src/widgets/doc/src/gestures.qdoc +++ b/src/widgets/doc/src/gestures.qdoc @@ -67,7 +67,7 @@ required gesture type. The standard types are defined by the Qt::GestureType enum and include many commonly used gestures. - \snippet ../../../examples/gestures/imagegestures/imagewidget.cpp enable gestures + \snippet gestures/imagegestures/imagewidget.cpp enable gestures In the above code, the gestures are set up in the constructor of the target object itself. @@ -124,18 +124,18 @@ \l{QWidget::}{event()} handler function and delegates gesture events to a specialized gestureEvent() function: - \snippet ../../../examples/gestures/imagegestures/imagewidget.cpp event handler + \snippet gestures/imagegestures/imagewidget.cpp event handler The gesture events delivered to the target object can be examined individually and dealt with appropriately: - \snippet ../../../examples/gestures/imagegestures/imagewidget.cpp gesture event handler + \snippet gestures/imagegestures/imagewidget.cpp gesture event handler Responding to a gesture is simply a matter of obtaining the QGesture object delivered in the QGestureEvent sent to the target object and examining the information it contains. - \snippet ../../../examples/gestures/imagegestures/imagewidget.cpp swipe function + \snippet gestures/imagegestures/imagewidget.cpp swipe function Here, we examine the direction in which the user swiped the widget and modify its contents accordingly. |