diff options
| author | Warwick Allison <warwick.allison@nokia.com> | 2009-10-14 06:29:19 (GMT) |
|---|---|---|
| committer | Warwick Allison <warwick.allison@nokia.com> | 2009-10-14 06:29:19 (GMT) |
| commit | 48e0e746f754b96ab77615db269acefaf7db023d (patch) | |
| tree | e07924d962d5d8590ad0e705b5c08150258dc093 /doc/src | |
| parent | 0cd18d2ccf2e1cb5d2b2b0d3ad50878fcbfa91ed (diff) | |
| parent | 35b79015894f171b112ad3b42268973b9c597a6f (diff) | |
| download | Qt-48e0e746f754b96ab77615db269acefaf7db023d.zip Qt-48e0e746f754b96ab77615db269acefaf7db023d.tar.gz Qt-48e0e746f754b96ab77615db269acefaf7db023d.tar.bz2 | |
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Diffstat (limited to 'doc/src')
| -rw-r--r-- | doc/src/declarative/qmldocument.qdoc | 2 | ||||
| -rw-r--r-- | doc/src/declarative/qtbinding.qdoc (renamed from doc/src/declarative/binding.qdoc) | 0 |
2 files changed, 2 insertions, 0 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..94465a1 100644 --- a/doc/src/declarative/binding.qdoc +++ b/doc/src/declarative/qtbinding.qdoc |