diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-12-19 22:20:41 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-12-19 22:20:41 (GMT) |
| commit | 8d87a34453fe0f18ebee5a9a0a4edd6f58b896ef (patch) | |
| tree | c107c88a8cc37364f8bcbd0ab9f8b4407b756400 | |
| parent | 6bc85e66c3c3ba837dc6720222f73e53f2df7fa3 (diff) | |
| parent | cb416ae734f39464d4481adbc56f57ba06ecadb7 (diff) | |
| download | Qt-8d87a34453fe0f18ebee5a9a0a4edd6f58b896ef.zip Qt-8d87a34453fe0f18ebee5a9a0a4edd6f58b896ef.tar.gz Qt-8d87a34453fe0f18ebee5a9a0a4edd6f58b896ef.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-doc-staging into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-doc-staging:
Fix a bug where 'int' is not printed in snippets.
| -rw-r--r-- | tools/qdoc3/ditaxmlgenerator.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/tools/qdoc3/ditaxmlgenerator.cpp b/tools/qdoc3/ditaxmlgenerator.cpp index e3e32a0..06f7e8b 100644 --- a/tools/qdoc3/ditaxmlgenerator.cpp +++ b/tools/qdoc3/ditaxmlgenerator.cpp @@ -3492,7 +3492,8 @@ void DitaXmlGenerator::writeText(const QString& markedCode, addLink(link, arg); } else { - link = arg.toString(); + //Encountered in snippets for example. Where the text should not be a link. + writeCharacters(arg.toString()); } } else { |