summaryrefslogtreecommitdiffstats
path: root/doc/src
diff options
context:
space:
mode:
Diffstat (limited to 'doc/src')
-rw-r--r--doc/src/declarative/qmldocument.qdoc2
-rw-r--r--doc/src/declarative/qtbinding.qdoc (renamed from doc/src/declarative/binding.qdoc)9
-rw-r--r--doc/src/declarative/qtdeclarative.qdoc1
3 files changed, 11 insertions, 1 deletions
diff --git a/doc/src/declarative/qmldocument.qdoc b/doc/src/declarative/qmldocument.qdoc
index 84e7926..2775ea6 100644
--- a/doc/src/declarative/qmldocument.qdoc
+++ b/doc/src/declarative/qmldocument.qdoc
@@ -71,6 +71,8 @@ Rectangle {
}
\endcode
+QML documents are always encoded in UTF-8 format.
+
A QML document always begins with one or more import statements. To prevent elements
introduced in later versions from affecting existing QML programs, the element types
available within a document are controlled by the imported QML \l {Modules}. That is,
diff --git a/doc/src/declarative/binding.qdoc b/doc/src/declarative/qtbinding.qdoc
index 94465a1..e925227 100644
--- a/doc/src/declarative/binding.qdoc
+++ b/doc/src/declarative/qtbinding.qdoc
@@ -42,7 +42,14 @@
/*!
\page qtbinding.html
\target qtbinding
-\title QML/C++ Data Binding
+\title Using QML in C++ Applications
+
+\list
+\o QmlEngine and QmlComponent
+\o QmlContext and data
+\o QBindableMap
+\o QAbstractItemModel Data models
+\endlist
The QML mechanisms of data binding can also be used to bind Qt C++ objects.
diff --git a/doc/src/declarative/qtdeclarative.qdoc b/doc/src/declarative/qtdeclarative.qdoc
index 73814db..45f9347 100644
--- a/doc/src/declarative/qtdeclarative.qdoc
+++ b/doc/src/declarative/qtdeclarative.qdoc
@@ -77,6 +77,7 @@ completely new applications. QML is fully \l {Extending QML}{extensible from C+
\o \l {tutorials-declarative-contacts.html}{Tutorial: 'Introduction to QML'}
\o \l {advtutorial.html}{Advanced Tutorial: 'Same Game'}
\o \l {QML Examples and Walkthroughs}
+\o \l {Using QML in C++ Applications}
\endlist
\section1 Core QML Features: