summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrew Christian <andrew.christian@nokia.com>2012-03-19 10:22:18 -0400
committerChris Craig <ext-chris.craig@nokia.com>2012-03-19 15:29:32 +0100
commit76131f514514b85baeb47a7e0bf133ad3092c565 (patch)
tree96912cdf34456ee02cbca985f37de9e3799bc455
parent89a2d0ac0713a20506439c371bd29d25d82fb741 (diff)
Fixed documentation for qdoc and UTF-16
Change-Id: I192455a0bd26a15c036ae00e1e026f3f9f2335ef Reviewed-by: Chris Craig <ext-chris.craig@nokia.com>
-rw-r--r--doc/doc.pri2
-rw-r--r--doc/src/jsonstreamnamespace.qdoc2
2 files changed, 3 insertions, 1 deletions
diff --git a/doc/doc.pri b/doc/doc.pri
index bd7dd73..0c80540 100644
--- a/doc/doc.pri
+++ b/doc/doc.pri
@@ -1,7 +1,7 @@
OTHER_FILES += $$PWD/jsonstream.qdocconf
docs_target.target = docs
-docs_target.commands = qdoc3 $$PWD/jsonstream.qdocconf
+docs_target.commands = qdoc $$PWD/jsonstream.qdocconf
QMAKE_EXTRA_TARGETS = docs_target
QMAKE_CLEAN += "-r $$PWD/html"
diff --git a/doc/src/jsonstreamnamespace.qdoc b/doc/src/jsonstreamnamespace.qdoc
index cff9499..630e24f 100644
--- a/doc/src/jsonstreamnamespace.qdoc
+++ b/doc/src/jsonstreamnamespace.qdoc
@@ -65,4 +65,6 @@
\value FormatUTF8 UTF-8
\value FormatBSON BSON binary format
\value FormatQBJS Qt Binary Json
+ \value FormatUTF16BE UTF-16, Big Endian
+ \value FormatUTF16LE UTF-16, Little Endian
*/