4 files changed, 13 insertions, 14 deletions
diff --git a/src/gui/kernel/qevent.cpp b/src/gui/kernel/qevent.cpp
index 06fa1f3550..28666085a7 100644
--- a/src/gui/kernel/qevent.cpp
+++ b/src/gui/kernel/qevent.cpp
@@ -118,7 +118,7 @@ QInputEvent::~QInputEvent()
     Returns the keyboard modifier flags that existed immediately
     before the event occurred.
 
-    \sa QApplication::keyboardModifiers()
+    \sa QGuiApplication::keyboardModifiers()
 */
 
 /*! \fn void QInputEvent::setModifiers(Qt::KeyboardModifiers modifiers)
@@ -313,7 +313,7 @@ QMouseEvent::~QMouseEvent()
     Returns the position of the mouse cursor as a QPointF, relative to the
     screen that received the event.
 
-    \sa x(), y(), pos(), localPos(), screenPos()
+    \sa x(), y(), pos(), localPos(), windowPos()
 */
 
 /*!
@@ -1005,7 +1005,7 @@ QKeyEvent::~QKeyEvent()
     confuse it by pressing both \uicontrol{Shift} keys simultaneously and
     releasing one of them, for example.
 
-    \sa QApplication::keyboardModifiers()
+    \sa QGuiApplication::keyboardModifiers()
 */
 
 Qt::KeyboardModifiers QKeyEvent::modifiers() const
@@ -1357,7 +1357,7 @@ QResizeEvent::~QResizeEvent()
     signal when they are deleted.
 
     If the last top-level window is closed, the
-    QApplication::lastWindowClosed() signal is emitted.
+    QGuiApplication::lastWindowClosed() signal is emitted.
 
     The isAccepted() function returns \c true if the event's receiver has
     agreed to close the widget; call accept() to agree to close the
@@ -1366,7 +1366,7 @@ QResizeEvent::~QResizeEvent()
 
     \sa QWidget::close(), QWidget::hide(), QObject::destroyed(),
         QCoreApplication::exec(), QCoreApplication::quit(),
-        QApplication::lastWindowClosed()
+        QGuiApplication::lastWindowClosed()
 */
 
 /*!
@@ -2676,9 +2676,8 @@ QDragEnterEvent::~QDragEnterEvent()
     is within its boundaries, if it accepts
     \l{QWidget::setAcceptDrops()}{drop events} and \l
     {QWidget::dragEnterEvent()}{enter events}. The widget should
-    examine the event to see what kind of data it
-    \l{QDragMoveEvent::provides()}{provides}, and call the accept()
-    function to accept the drop if appropriate.
+    examine the event to see what kind of \l{mimeData()}{data} it
+    provides, and call the accept() function to accept the drop if appropriate.
 
     The rectangle supplied by the answerRect() function can be used to restrict
     drops to certain parts of the widget. For example, we can check whether the
diff --git a/src/gui/kernel/qopenglcontext.cpp b/src/gui/kernel/qopenglcontext.cpp
index ab782fac34..7b111c73e1 100644
--- a/src/gui/kernel/qopenglcontext.cpp
+++ b/src/gui/kernel/qopenglcontext.cpp
@@ -274,7 +274,7 @@ QMutex QOpenGLContextPrivate::makeCurrentTrackerMutex;
     or OpenGL ES 1.x.
 
     For more information about the OpenGL API, refer to the official
-    \l{OpenGL documentation}.
+    \l{http://www.opengl.org}{OpenGL documentation}.
 
     For an example of how to use QOpenGLContext see the
     \l{OpenGL Window Example}{OpenGL Window} example.
@@ -591,6 +591,8 @@ QOpenGLFunctions *QOpenGLContext::functions() const
 /*!
     \fn T *QOpenGLContext::versionFunctions() const
 
+    \overload versionFunctions()
+
     Returns a pointer to an object that provides access to all functions for
     the version and profile of this context. Before using any of the functions
     they must be initialized by calling QAbstractOpenGLFunctions::initializeOpenGLFunctions().
@@ -640,8 +642,6 @@ QOpenGLFunctions *QOpenGLContext::functions() const
 
     Usually one would use the template version of this function to automatically
     have the result cast to the correct type.
-
-    \sa T *QOpenGLContext::versionFunctions()
 */
 QAbstractOpenGLFunctions *QOpenGLContext::versionFunctions(const QOpenGLVersionProfile &versionProfile) const
 {
diff --git a/src/gui/kernel/qplatformsystemtrayicon_qpa.cpp b/src/gui/kernel/qplatformsystemtrayicon_qpa.cpp
index 5d7ff7864d..c4cec40a10 100644
--- a/src/gui/kernel/qplatformsystemtrayicon_qpa.cpp
+++ b/src/gui/kernel/qplatformsystemtrayicon_qpa.cpp
@@ -130,7 +130,7 @@ QPlatformSystemTrayIcon::~QPlatformSystemTrayIcon()
                                                   const QIcon &icon, MessageIcon iconType, int secs)
     Shows a balloon message for the entry with the given \a title, message \a msg and \a icon for
     the time specified in \a secs. \a iconType is used as a hint for the implementing platform.
-    \sa QSystemTrayIcon::showMessage
+    \sa QSystemTrayIcon::showMessage()
 */
 
 /*!
diff --git a/src/gui/kernel/qsurfaceformat.cpp b/src/gui/kernel/qsurfaceformat.cpp
index 2f1b30ae4a..fe5615d394 100644
--- a/src/gui/kernel/qsurfaceformat.cpp
+++ b/src/gui/kernel/qsurfaceformat.cpp
@@ -396,7 +396,7 @@ bool QSurfaceFormat::hasAlpha() const
 /*!
     Set the preferred stencil buffer size to \a size bits.
 
-    \sa stencilBufferSize(), setStencil(), stencil()
+    \sa stencilBufferSize()
 */
 void QSurfaceFormat::setStencilBufferSize(int size)
 {
@@ -409,7 +409,7 @@ void QSurfaceFormat::setStencilBufferSize(int size)
 /*!
     Returns the stencil buffer size in bits.
 
-    \sa stencil(), setStencil(), setStencilBufferSize()
+    \sa setStencilBufferSize()
 */
 int QSurfaceFormat::stencilBufferSize() const
 {