diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-01-22 08:07:37 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-01-22 08:07:37 (GMT) |
| commit | 26b07492710de0551bb21d7fd1e7767d5093cf7d (patch) | |
| tree | f573faff3b90cb3c3c9d848bdf2e377825eac090 /doc/src/snippets/code | |
| parent | d1f77a5e47d79b9fb688046a7357bc0c8b21c875 (diff) | |
| parent | 52c040be74bc705fa50eda88bac275a6bd1645a8 (diff) | |
| download | Qt-26b07492710de0551bb21d7fd1e7767d5093cf7d.zip Qt-26b07492710de0551bb21d7fd1e7767d5093cf7d.tar.gz Qt-26b07492710de0551bb21d7fd1e7767d5093cf7d.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1:
Assistant docs: Fix link.
QtHelp docs: Fix illegal namespace name.
Assistant: Set correct mime type for text documents.
Diffstat (limited to 'doc/src/snippets/code')
| -rw-r--r-- | doc/src/snippets/code/doc_src_qthelp.qdoc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/src/snippets/code/doc_src_qthelp.qdoc b/doc/src/snippets/code/doc_src_qthelp.qdoc index 017879d..f7b880a 100644 --- a/doc/src/snippets/code/doc_src_qthelp.qdoc +++ b/doc/src/snippets/code/doc_src_qthelp.qdoc @@ -110,7 +110,7 @@ if (links.count()) { //! [7] <?xml version="1.0" encoding="UTF-8"?> <QtHelpProject version="1.0"> - <namespace>mycompany.com.myapplication.1_0</namespace> + <namespace>mycompany.com.myapplication.1.0</namespace> <virtualFolder>doc</virtualFolder> <customFilter name="My Application 1.0"> <filterAttribute>myapp</filterAttribute> |