diff options
| author | axis <qt-info@nokia.com> | 2010-01-26 13:53:12 (GMT) |
|---|---|---|
| committer | axis <qt-info@nokia.com> | 2010-01-26 13:53:12 (GMT) |
| commit | fa81d43f8bba47286e3f16b7aa092822c7bd5f7e (patch) | |
| tree | 2ae250485fa9191c07894a6bf02c8d154f3b0bd3 /doc/src/snippets/code | |
| parent | d64407cf376c5723663ebe81f156a3da98d7df24 (diff) | |
| parent | 9175f9e5bad0f77e5d53751a8e839c8ea7df4c23 (diff) | |
| download | Qt-fa81d43f8bba47286e3f16b7aa092822c7bd5f7e.zip Qt-fa81d43f8bba47286e3f16b7aa092822c7bd5f7e.tar.gz Qt-fa81d43f8bba47286e3f16b7aa092822c7bd5f7e.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public
Conflicts:
mkspecs/common/symbian/symbian.conf
src/gui/kernel/qapplication_s60.cpp
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> |