3 files changed, 21 insertions, 6 deletions
diff --git a/src/qml/doc/src/cppintegration/definetypes.qdoc b/src/qml/doc/src/cppintegration/definetypes.qdoc
index ece2fd5fd7..ffe0ec9737 100644
--- a/src/qml/doc/src/cppintegration/definetypes.qdoc
+++ b/src/qml/doc/src/cppintegration/definetypes.qdoc
@@ -69,6 +69,21 @@ exposed to QML but the type itself should not be instantiable.
 For a quick guide to choosing the correct approach to expose C++ types to QML,
 see \l {Choosing the Correct Integration Method Between C++ and QML}.
 
+\section2 Preconditions
+
+All the macros mentioned below are available from the \c qqml.h
+header. You need to add the following code to the files using them in order to
+make the macros available:
+
+\code
+#include <QtQml/qqml.h>
+\endcode
+
+Furthermore, your class declarations have to live in headers reachable via your
+project's include path. The declarations are used to generate registration code
+at compile time, and the registration code needs to include the headers that
+contain the declarations.
+
 \section2 Registering an Instantiable Object Type
 
 \b{Any QObject-derived C++ class can be registered as the definition of a
diff --git a/src/qml/doc/src/qmlfunctions.qdoc b/src/qml/doc/src/qmlfunctions.qdoc
index 4e531ceb61..6f5a0c4196 100644
--- a/src/qml/doc/src/qmlfunctions.qdoc
+++ b/src/qml/doc/src/qmlfunctions.qdoc
@@ -159,11 +159,11 @@
   \relates QQmlEngine
 
   Declares the enclosing type to be a singleton in QML. This only takes effect
-  if the type is available in QML, by having a \l QML_ELEMENT or
-  \l QML_NAMED_ELEMENT() macro. By default, each QQmlEngine will try to create a
-  singleton instance using the type's default constructor when the type is first
-  accessed. If there is no default constructor the singleton is initially
-  inaccessible. This behavior can be overridden by calling
+  if the type is a \l Q_OBJECT and is available in QML (by having a
+  \l QML_ELEMENT or \l QML_NAMED_ELEMENT() macro). By default, each QQmlEngine
+  will try to create a singleton instance using the type's default constructor
+  when the type is first accessed. If there is no default constructor the
+  singleton is initially inaccessible. This behavior can be overridden by calling
   \l qmlRegisterSingletonType() with a specific factory function or
   \l qmlRegisterSingletonInstance() with a specific instance for the same class
   and the same type namespace and version.
diff --git a/src/qml/doc/src/qmllanguageref/syntax/signals.qdoc b/src/qml/doc/src/qmllanguageref/syntax/signals.qdoc
index 075b3a7646..0e06cbec8a 100644
--- a/src/qml/doc/src/qmllanguageref/syntax/signals.qdoc
+++ b/src/qml/doc/src/qmllanguageref/syntax/signals.qdoc
@@ -133,7 +133,7 @@ Rectangle {
 
     Connections {
         target: button
-        function onClicked(): {
+        function onClicked() {
             rect.color = Qt.rgba(Math.random(), Math.random(), Math.random(), 1);
         }
     }