diff options
| author | Morten Engvoldsen <morten.engvoldsen@nokia.com> | 2010-11-04 09:33:23 (GMT) |
|---|---|---|
| committer | Morten Engvoldsen <morten.engvoldsen@nokia.com> | 2010-11-04 09:33:23 (GMT) |
| commit | 5549cd45e319e3019e2aac64a2143977f860e883 (patch) | |
| tree | 288ac8f55fb634d81ee62c8eddc08929971d02e0 /tools | |
| parent | fa4ee0aadd00c976a70ef63aeb5be1d4eb52f928 (diff) | |
| parent | 4b0ced38a3e52836a8122bee95fa9056818e1206 (diff) | |
| download | Qt-5549cd45e319e3019e2aac64a2143977f860e883.zip Qt-5549cd45e319e3019e2aac64a2143977f860e883.tar.gz Qt-5549cd45e319e3019e2aac64a2143977f860e883.tar.bz2 | |
Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/linguist/shared/ts.dtd | 23 | ||||
| -rw-r--r-- | tools/qdoc3/qdoc3.pro | 4 |
2 files changed, 7 insertions, 20 deletions
diff --git a/tools/linguist/shared/ts.dtd b/tools/linguist/shared/ts.dtd index 4d2cdeb..12d3562 100644 --- a/tools/linguist/shared/ts.dtd +++ b/tools/linguist/shared/ts.dtd @@ -4,8 +4,6 @@ ! ! The location element is set as optional since it was introduced first in Qt 4.2. ! The userdata element is set as optional since it was introduced first in Qt 4.4. - ! The source and translation elements are optional starting with version 3.0 - ! (Qt 4.6) to support S60 blank messages. ! --> <!-- @@ -36,13 +34,10 @@ language CDATA #IMPLIED> <!-- The encoding to use in the QM file by default. Default is ISO-8859-1. --> <!ELEMENT defaultcodec (#PCDATA) > -<!ELEMENT context (name?, comment?, (context|message)+) > +<!ELEMENT context (name, comment?, (context|message)+) > <!ATTLIST context encoding CDATA #IMPLIED> <!ELEMENT name %evilstring; > -<!-- If "no", then the context nesting is for informational puposes only --> -<!ATTLIST name - nest (yes|no) "yes"> <!-- This is "disambiguation" in the (new) API, or "msgctxt" in gettext speak --> <!ELEMENT comment %evilstring; > <!-- Previous content of comment (result of merge) --> @@ -53,12 +48,13 @@ <!ELEMENT translatorcomment %evilstring; > <!ELEMENT message (location*, source?, oldsource?, comment?, oldcomment?, extracomment?, translatorcomment?, translation?, userdata?, extra-**) > <!-- - ! If utf8 is true, the defaultcodec is overridden and the message is encoded - ! in UTF-8 in the QM file. + ! If utf8 is "true", the defaultcodec is overridden and the message is encoded + ! in UTF-8 in the QM file. If it is "both", both source encodings are stored + ! in the QM file. --> <!ATTLIST message id CDATA #IMPLIED - utf8 (true|false) "false" + utf8 (true|false|both) "false" numerus (yes|no) "no"> <!ELEMENT location EMPTY> <!-- @@ -100,14 +96,5 @@ --> <!ELEMENT numerusform (#PCDATA|byte|lengthvariant)* > <!ATTLIST numerusform - plurality (nullar|singular|dual|trial|paucal|greaterpaucal|plural|greaterplural) #IMPLIED> variants (yes|no) "no"> <!ELEMENT lengthvariant %evilstring; > -<!-- - ! The translation variants have a priority between 1 ("highest") and 9 ("lowest") - ! Typically longer translations get a higher priority. - ! If omitted, the order of appearance of the variants in the TS files is used. - --> -<!ATTLIST lengthvariant - priority (1|2|3|4|5|6|7|8|9) #IMPLIED> - diff --git a/tools/qdoc3/qdoc3.pro b/tools/qdoc3/qdoc3.pro index ae0bf25..d47e066 100644 --- a/tools/qdoc3/qdoc3.pro +++ b/tools/qdoc3/qdoc3.pro @@ -120,9 +120,9 @@ SOURCES += apigenerator.cpp \ qtPrepareTool(QDOC, qdoc3) -docs.commands = $$QDOC qdoc-manual.qdocconf +html-docs.commands = cd \"$$PWD/doc\" && $$QDOC qdoc-manual.qdocconf -QMAKE_EXTRA_TARGETS += docs +QMAKE_EXTRA_TARGETS += html-docs target.path = $$[QT_INSTALL_BINS] INSTALLS += target |