summaryrefslogtreecommitdiffstats
path: root/doc/src
diff options
context:
space:
mode:
authorBea Lam <bea.lam@nokia.com>2009-10-14 05:47:41 (GMT)
committerBea Lam <bea.lam@nokia.com>2009-10-14 05:47:41 (GMT)
commitbf9351da18405edc41eb59ee7c637ec6bf092fd1 (patch)
tree5910e51ad15ee9ea7f1845ff938f15ac531b4822 /doc/src
parentce33aa1fd8973cf066d0e5b8fc88971404d6b037 (diff)
parent8e9a0667ee8856558694d9d661585d36f7f41da8 (diff)
downloadQt-bf9351da18405edc41eb59ee7c637ec6bf092fd1.zip
Qt-bf9351da18405edc41eb59ee7c637ec6bf092fd1.tar.gz
Qt-bf9351da18405edc41eb59ee7c637ec6bf092fd1.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/qmlformat.qdoc4
1 files changed, 4 insertions, 0 deletions
diff --git a/doc/src/declarative/qmlformat.qdoc b/doc/src/declarative/qmlformat.qdoc
index be1afa4..72bbe40 100644
--- a/doc/src/declarative/qmlformat.qdoc
+++ b/doc/src/declarative/qmlformat.qdoc
@@ -192,6 +192,10 @@ different property bindings.
\section1 Syntax
+\section2 Encoding
+
+QML files are always encoded in UTF-8 format.
+
\section2 Commenting
The commenting rules in QML are the same as for ECMAScript. Both \e {MultiLineComment} blocks and \e {SingleLineComment}'s are supported.