summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorMartin Smith <martin.smith@nokia.com>2011-05-12 11:51:05 +0200
committerMartin Smith <martin.smith@nokia.com>2011-05-12 11:51:05 +0200
commitcbfce340785ffbc36a7641babf18ae72e94d0c34 (patch)
tree9195bc15acf9eb82fa6e53162c2aede1ec954e3e /tools
parent01725b8575a84ec26af8ae1c0ae946afe796ed2b (diff)
doc: Fixed QTBUG-19223
Diffstat (limited to 'tools')
-rw-r--r--tools/qdoc3/ditaxmlgenerator.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/tools/qdoc3/ditaxmlgenerator.cpp b/tools/qdoc3/ditaxmlgenerator.cpp
index 32c3a6ff48..31596bb8a6 100644
--- a/tools/qdoc3/ditaxmlgenerator.cpp
+++ b/tools/qdoc3/ditaxmlgenerator.cpp
@@ -1481,7 +1481,7 @@ int DitaXmlGenerator::generateAtom(const Atom *atom,
generateLink(atom, relative, marker);
}
else {
- writeCharacters(protectEnc(atom->string()));
+ writeCharacters(atom->string());
}
break;
case Atom::TableLeft:
@@ -3677,6 +3677,7 @@ QString DitaXmlGenerator::protect(const QString& string, const QString& outputEn
else if (ch == QLatin1Char('"')) {
APPEND("&quot;");
}
+#if 0
else if ((outputEncoding == "ISO-8859-1" && ch.unicode() > 0x007F) ||
(ch == QLatin1Char('*') && i + 1 < n && string.at(i) == QLatin1Char('/')) ||
(ch == QLatin1Char('.') && i > 2 && string.at(i - 2) == QLatin1Char('.'))) {
@@ -3685,6 +3686,7 @@ QString DitaXmlGenerator::protect(const QString& string, const QString& outputEn
xml += QString::number(ch.unicode(), 16);
xml += QLatin1Char(';');
}
+#endif
else {
if (!xml.isEmpty())
xml += ch;