4 files changed, 8 insertions, 7 deletions
diff --git a/src/qml/doc/src/cppintegration/data.qdoc b/src/qml/doc/src/cppintegration/data.qdoc
index 9cc7291583..c3d073872a 100644
--- a/src/qml/doc/src/cppintegration/data.qdoc
+++ b/src/qml/doc/src/cppintegration/data.qdoc
@@ -370,7 +370,7 @@ properties:
 
  private:
      QString m_name;
- }
+ };
 
  Q_DECLARE_METATYPE(Actor)
 \endcode
diff --git a/src/qml/doc/src/cppintegration/definetypes.qdoc b/src/qml/doc/src/cppintegration/definetypes.qdoc
index 32084bd308..1ce00c6ad0 100644
--- a/src/qml/doc/src/cppintegration/definetypes.qdoc
+++ b/src/qml/doc/src/cppintegration/definetypes.qdoc
@@ -346,8 +346,8 @@ demonstrates a usage of extension objects.
 
 \section1 Defining QML-Specific Types and Attributes
 
-
-\section2 Providing Attached Objects for Data Annotations
+\section2 Providing Attached Properties
+\keyword Integrating QML and C++ - Attached Properties
 
 In the QML language syntax, there is a notion of \l{Attached properties and
 attached signal handlers}{\e {attached properties} and \e {attached signal
diff --git a/src/qml/doc/src/cppintegration/exposecppattributes.qdoc b/src/qml/doc/src/cppintegration/exposecppattributes.qdoc
index c4c58c2821..2121c1f291 100644
--- a/src/qml/doc/src/cppintegration/exposecppattributes.qdoc
+++ b/src/qml/doc/src/cppintegration/exposecppattributes.qdoc
@@ -301,6 +301,7 @@ Note that the template class type for the QQmlListProperty — in this case,
 
 
 \section2 Grouped Properties
+\keyword Integrating QML and C++ - Grouped Properties
 
 Any read-only object-type property is accessible from QML code as a
 \e {grouped property}. This can be used to expose a group of related
diff --git a/src/qml/doc/src/cppintegration/topic.qdoc b/src/qml/doc/src/cppintegration/topic.qdoc
index 22115395b1..183af25297 100644
--- a/src/qml/doc/src/cppintegration/topic.qdoc
+++ b/src/qml/doc/src/cppintegration/topic.qdoc
@@ -46,13 +46,13 @@ BackEnd, in a QML application:
 \li Add a new C++ class called \c BackEnd to the project and replace its header
 file contents with:
 
-\quotefile code/backend/backend.h
+\snippet code/backend/backend.h backend_header
 
 The \c Q_PROPERTY macro declares a property that could be accessed from QML.
 
 \li Replace its C++ file contents with:
 
-\quotefile code/backend/backend.cpp
+\snippet code/backend/backend.cpp backend_cpp
 
 The \c setUserName function emits the \c userNameChanged signal every time
 \c m_userName value changes. The signal can be handled from QML using the
@@ -61,14 +61,14 @@ The \c setUserName function emits the \c userNameChanged signal every time
 \li Include \c "backend.h" in \c main.cpp and register the class as a QML type
 under a import URL as shown below:
 
-\quotefile code/backend/main.cpp
+\snippet code/backend/main.cpp main_cpp
 
 The BackEnd class is registered as a type, which is accessible from QML by
 importing the URL, "\c{io.qt.examples.backend 1.0}".
 
 \li Replace the contents of \c main.qml with the following code:
 
-\quotefile code/backend/main.qml
+\snippet code/backend/main.qml main_qml
 
 The \c BackEnd instance lets you access the \c userName property, which
 is updated when the TextField's \c text property changes.