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>

18 files changed, 22 insertions, 22 deletions

diff --git a/examples/examples.pro b/examples/examples.pro
index b0f59c2020..79d8d14fce 100644
--- a/examples/examples.pro
+++ b/examples/examples.pro
@@ -4,7 +4,6 @@ CONFIG += no_docs_target
 SUBDIRS = \
     dbus \
     embedded \
-    gestures \
     gui \
     ipc \
     json \
diff --git a/examples/network/doc/src/fortuneclient.qdoc b/examples/network/doc/src/fortuneclient.qdoc
index bf208475a8..01acf45837 100644
--- a/examples/network/doc/src/fortuneclient.qdoc
+++ b/examples/network/doc/src/fortuneclient.qdoc
@@ -63,7 +63,7 @@
     \endlist
 
     In this example, we will demonstrate the asynchronous approach. The
-    \l{blockingfortuneclient}{Blocking Fortune Client} example
+    \l{blockingfortuneclient}{Blocking Fortune Client Example}
     illustrates the synchronous approach.
 
     Our class contains some data and a few private slots:
diff --git a/examples/network/doc/src/fortuneserver.qdoc b/examples/network/doc/src/fortuneserver.qdoc
index 022e16a9d7..fd61f864f0 100644
--- a/examples/network/doc/src/fortuneserver.qdoc
+++ b/examples/network/doc/src/fortuneserver.qdoc
@@ -33,7 +33,7 @@
 
     This example is intended to be run alongside the
     \l{fortuneclient}{Fortune Client} example or the
-    \l{blockingfortuneclient}{Blocking Fortune Client} example.
+    \l{blockingfortuneclient}{Blocking Fortune Client Example}.
 
     \image fortuneserver-example.png Screenshot of the Fortune Server example
 
diff --git a/examples/threads/doc/src/mandelbrot.qdoc b/examples/threads/doc/src/mandelbrot.qdoc
index 6a9d0da193..c1393769f1 100644
--- a/examples/threads/doc/src/mandelbrot.qdoc
+++ b/examples/threads/doc/src/mandelbrot.qdoc
@@ -47,7 +47,7 @@
     large set of problems, including synchronous network I/O and
     database access, where the user interface must remain responsive
     while some heavy operation is taking place. The \l
-    network/blockingfortuneclient example shows the same principle at
+    {Blocking Fortune Client Example} shows the same principle at
     work in a TCP client.
 
     The Mandelbrot application supports zooming and scrolling using
diff --git a/examples/widgets/doc/src/plugandpaint.qdoc b/examples/widgets/doc/src/plugandpaint.qdoc
index 5098d892ef..4e48245bd9 100644
--- a/examples/widgets/doc/src/plugandpaint.qdoc
+++ b/examples/widgets/doc/src/plugandpaint.qdoc
@@ -316,7 +316,7 @@
     \title Plug & Paint Basic Tools Example
 
     The Basic Tools example is a static plugin for the
-    \l{plugandpaint}{Plug & Paint} example. It provides a set
+    \l{tools/plugandpaint}{Plug & Paint} example. It provides a set
     of basic brushes, shapes, and filters. Through the Basic Tools
     example, we will review the four steps involved in writing a Qt
     plugin:
@@ -333,7 +333,7 @@
     \snippet tools/plugandpaintplugins/basictools/basictoolsplugin.h 0
 
     We start by including \c interfaces.h, which defines the plugin
-    interfaces for the \l{plugandpaint}{Plug & Paint}
+    interfaces for the \l{tools/plugandpaint}{Plug & Paint}
     application. For the \c #include to work, we need to add an \c
     INCLUDEPATH entry to the \c .pro file with the path to Qt's \c
     examples/tools directory.
@@ -344,7 +344,7 @@
     The \c Q_INTERFACES() macro is necessary to tell \l{moc}, Qt's
     meta-object compiler, that the base classes are plugin
     interfaces. Without the \c Q_INTERFACES() macro, we couldn't use
-    \l qobject_cast() in the \l{plugandpaint}{Plug & Paint}
+    \l qobject_cast() in the \l{tools/plugandpaint}{Plug & Paint}
     application to detect interfaces.
     For an explanation for the \c Q_PLUGIN_METADATA() macro see
     \l {Exporting the Plugin}.
@@ -501,7 +501,7 @@
     \title Plug & Paint Extra Filters Example
 
     The Extra Filters example is a plugin for the
-    \l{plugandpaint}{Plug & Paint} example. It provides a set
+    \l{tools/plugandpaint}{Plug & Paint} example. It provides a set
     of filters in addition to those provided by the
     \l{tools/plugandpaintplugins/basictools}{Basic Tools} plugin.
 
diff --git a/examples/gestures/gestures.pro b/examples/widgets/gestures/gestures.pro
index ecbcf07480..ecbcf07480 100644
--- a/examples/gestures/gestures.pro
+++ b/examples/widgets/gestures/gestures.pro
diff --git a/examples/gestures/imagegestures/doc/src/imagegestures.qdoc b/examples/widgets/gestures/imagegestures/doc/src/imagegestures.qdoc
index cb76ee83b1..d6d215d6bd 100644
--- a/examples/gestures/imagegestures/doc/src/imagegestures.qdoc
+++ b/examples/widgets/gestures/imagegestures/doc/src/imagegestures.qdoc
@@ -43,9 +43,9 @@
     The \c ImageWidget class is a simple QWidget subclass that reimplements the general
     QWidget::event() handler function in addition to several more specific event handlers:
 
-    \snippet examples/gestures/imagegestures/imagewidget.h class definition begin
+    \snippet gestures/imagegestures/imagewidget.h class definition begin
     \dots
-    \snippet examples/gestures/imagegestures/imagewidget.h class definition end
+    \snippet gestures/imagegestures/imagewidget.h class definition end
 
     We also implement a private helper function, \c gestureEvent(), to help manage
     gesture events delivered to the widget, and three functions to perform actions
@@ -56,7 +56,7 @@
     In the widget's constructor, we begin by setting up various parameters that will
     be used to control the way images are displayed.
 
-    \snippet examples/gestures/imagegestures/imagewidget.cpp constructor
+    \snippet gestures/imagegestures/imagewidget.cpp constructor
 
     We enable three of the standard gestures for the widget by calling QWidget::grabGesture()
     with the types of gesture we need. These will be recognized by the application's
@@ -65,7 +65,7 @@
     Since QWidget does not define a specific event handler for gestures, the widget
     needs to reimplement the general QWidget::event() to receive gesture events.
 
-    \snippet examples/gestures/imagegestures/imagewidget.cpp event handler
+    \snippet gestures/imagegestures/imagewidget.cpp event handler
 
     We implement the event handler to delegate gesture events to a private function
     specifically written for the task, and pass all other events to QWidget's
@@ -76,7 +76,7 @@
     used on a widget at any particular time, we can check for each gesture type
     using the QGestureEvent::gesture() function:
 
-    \snippet examples/gestures/imagegestures/imagewidget.cpp gesture event handler
+    \snippet gestures/imagegestures/imagewidget.cpp gesture event handler
 
     If a QGesture object is supplied for a certain type of gesture, we call a special
     purpose function to deal with it, casting the gesture object to the appropriate
@@ -87,7 +87,7 @@
     gesture associated with a brushing or swiping motion on the user's display or
     input device:
 
-    \snippet examples/gestures/imagegestures/imagewidget.cpp swipe function
+    \snippet gestures/imagegestures/imagewidget.cpp swipe function
 
     The QSwipeGesture class provides specialized functions and defines a enum
     to make it more convenient for developers to discover which direction, if
diff --git a/examples/gestures/imagegestures/imagegestures.pro b/examples/widgets/gestures/imagegestures/imagegestures.pro
index c40c29564f..0d5b2f286c 100644
--- a/examples/gestures/imagegestures/imagegestures.pro
+++ b/examples/widgets/gestures/imagegestures/imagegestures.pro
@@ -7,6 +7,6 @@ SOURCES   = imagewidget.cpp \
             mainwidget.cpp
 
 # install
-target.path = $$[QT_INSTALL_EXAMPLES]/gestures/imagegestures
+target.path = $$[QT_INSTALL_EXAMPLES]/widgets/gestures/imagegestures
 INSTALLS += target
 
diff --git a/examples/gestures/imagegestures/imagewidget.cpp b/examples/widgets/gestures/imagegestures/imagewidget.cpp
index aad40afc26..aad40afc26 100644
--- a/examples/gestures/imagegestures/imagewidget.cpp
+++ b/examples/widgets/gestures/imagegestures/imagewidget.cpp
diff --git a/examples/gestures/imagegestures/imagewidget.h b/examples/widgets/gestures/imagegestures/imagewidget.h
index 7aaf554117..7aaf554117 100644
--- a/examples/gestures/imagegestures/imagewidget.h
+++ b/examples/widgets/gestures/imagegestures/imagewidget.h
diff --git a/examples/gestures/imagegestures/main.cpp b/examples/widgets/gestures/imagegestures/main.cpp
index aec32149f0..aec32149f0 100644
--- a/examples/gestures/imagegestures/main.cpp
+++ b/examples/widgets/gestures/imagegestures/main.cpp
diff --git a/examples/gestures/imagegestures/mainwidget.cpp b/examples/widgets/gestures/imagegestures/mainwidget.cpp
index 105cdf184e..105cdf184e 100644
--- a/examples/gestures/imagegestures/mainwidget.cpp
+++ b/examples/widgets/gestures/imagegestures/mainwidget.cpp
diff --git a/examples/gestures/imagegestures/mainwidget.h b/examples/widgets/gestures/imagegestures/mainwidget.h
index 5135466fde..5135466fde 100644
--- a/examples/gestures/imagegestures/mainwidget.h
+++ b/examples/widgets/gestures/imagegestures/mainwidget.h
diff --git a/examples/widgets/widgets.pro b/examples/widgets/widgets.pro
index 9c82ad0bb7..d7d3dbc445 100644
--- a/examples/widgets/widgets.pro
+++ b/examples/widgets/widgets.pro
@@ -9,6 +9,7 @@ SUBDIRS       = \
                 dialogs \
                 draganddrop \
                 effects \
+                gestures \
                 graphicsview \
                 itemviews \
                 layouts \
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.