7 files changed, 10 insertions, 11 deletions
diff --git a/src/corelib/global/qglobal.cpp b/src/corelib/global/qglobal.cpp
index 35213f8a4c..df0e6e876f 100644
--- a/src/corelib/global/qglobal.cpp
+++ b/src/corelib/global/qglobal.cpp
@@ -946,7 +946,7 @@ Q_STATIC_ASSERT_X(QT_POINTER_SIZE == sizeof(void *), "QT_POINTER_SIZE defined in
     \relates <QtGlobal>
     \since 5.7
 
-    Returns a pointer to a constant member function:
+    Returns the \a memberFunctionPointer pointer to a constant member function:
 
     \snippet code/src_corelib_global_qglobal.cpp 54
 
@@ -957,7 +957,7 @@ Q_STATIC_ASSERT_X(QT_POINTER_SIZE == sizeof(void *), "QT_POINTER_SIZE defined in
     \relates <QtGlobal>
     \since 5.7
 
-    Returns a pointer to a non-constant member function:
+    Returns the \a memberFunctionPointer pointer to a constant member function:
 
     \snippet code/src_corelib_global_qglobal.cpp 54
 
diff --git a/src/corelib/io/qnoncontiguousbytedevice.cpp b/src/corelib/io/qnoncontiguousbytedevice.cpp
index 872bebe87b..61299b8aa8 100644
--- a/src/corelib/io/qnoncontiguousbytedevice.cpp
+++ b/src/corelib/io/qnoncontiguousbytedevice.cpp
@@ -85,7 +85,7 @@ QT_BEGIN_NAMESPACE
     \internal
 */
 /*!
-    \fn virtual bool QNonContiguousByteDevice::atEnd()
+    \fn virtual bool QNonContiguousByteDevice::atEnd() const
 
      Returns \c true if everything has been read and the read
      pointer cannot be advanced anymore.
@@ -105,7 +105,7 @@ QT_BEGIN_NAMESPACE
     \internal
 */
 /*!
-    \fn virtual qint64 QNonContiguousByteDevice::size()
+    \fn virtual qint64 QNonContiguousByteDevice::size() const
 
     Returns the size of the complete device or -1 if unknown.
     May also return less/more than what can be actually read with readPointer()
diff --git a/src/corelib/io/qsettings.cpp b/src/corelib/io/qsettings.cpp
index dcbd69c5e5..6e788d28f4 100644
--- a/src/corelib/io/qsettings.cpp
+++ b/src/corelib/io/qsettings.cpp
@@ -2382,8 +2382,6 @@ void QConfFileSettingsPrivate::ensureSectionParsed(QConfFile *confFile,
        10.8 (Mountain Lion), only root can. However, 10.9 (Mavericks) changes
        that rule again but only for the native format (plist files).
 
-       \endlist
-
     \endlist
 
     \sa QVariant, QSessionManager, {Settings Editor Example}, {Application Example}
diff --git a/src/corelib/kernel/qcoreevent.cpp b/src/corelib/kernel/qcoreevent.cpp
index 3de8b2e7c9..00c120093f 100644
--- a/src/corelib/kernel/qcoreevent.cpp
+++ b/src/corelib/kernel/qcoreevent.cpp
@@ -191,6 +191,7 @@ QT_BEGIN_NAMESPACE
     \value ParentChange                     The widget parent has changed.
     \value PlatformPanel                    A platform specific panel has been requested.
     \value PlatformSurface                  A native platform surface has been created or is about to be destroyed (QPlatformSurfaceEvent).
+    \omitvalue Pointer
     \value Polish                           The widget is polished.
     \value PolishRequest                    The widget should be polished.
     \value QueryWhatsThis                   The widget should accept the event if it has "What's This?" help.
diff --git a/src/corelib/kernel/qmetaobject.cpp b/src/corelib/kernel/qmetaobject.cpp
index 4f764e7e78..2f2694f219 100644
--- a/src/corelib/kernel/qmetaobject.cpp
+++ b/src/corelib/kernel/qmetaobject.cpp
@@ -325,7 +325,7 @@ const char *QMetaObject::className() const
     \sa className()
 */
 
-/*
+/*!
     Returns \c true if the class described by this QMetaObject inherits
     the type described by \a metaObject; otherwise returns false.
 
diff --git a/src/corelib/statemachine/qsignaltransition.cpp b/src/corelib/statemachine/qsignaltransition.cpp
index 5dd88aef02..9972487eb5 100644
--- a/src/corelib/statemachine/qsignaltransition.cpp
+++ b/src/corelib/statemachine/qsignaltransition.cpp
@@ -153,12 +153,12 @@ QSignalTransition::QSignalTransition(const QObject *sender, const char *signal,
 
 /*!
   \fn QSignalTransition::QSignalTransition(const QObject *sender,
-                       PointerToMemberFunction signal, QState *sourceState);
+                       PointerToMemberFunction signal, QState *sourceState)
   \since 5.7
   \overload
 
   Constructs a new signal transition associated with the given \a signal of
-  the given \a sender object and with the given \a sourceSate.
+  the given \a sender object and with the given \a sourceState.
   This constructor is enabled if compiler supports delegating constructor.
 
   \sa Q_COMPILER_DELEGATING_CONSTRUCTORS
diff --git a/src/widgets/doc/snippets/code/doc_src_stylesheet.cpp b/src/widgets/doc/snippets/code/doc_src_stylesheet.cpp
index 01f4c528a2..f20440af18 100644
--- a/src/widgets/doc/snippets/code/doc_src_stylesheet.cpp
+++ b/src/widgets/doc/snippets/code/doc_src_stylesheet.cpp
@@ -140,5 +140,5 @@ ageSpinBox->setProperty("mandatoryField", true);
 //! [95]
 
 //! [96]
-qApp->setAttribute(Qt::AA_UseStyleSheetPropagationInWidgetStyles, true);
-//! [97]
+QCoreApplication::setAttribute(Qt::AA_UseStyleSheetPropagationInWidgetStyles, true);
+//! [96]