Define what the -slow command line option does.

Added configuration options for syntax highlighting and linking.
These are also enabled if the -slow command line option is used.

1 files changed, 4 insertions, 4 deletions

diff --git a/tools/qdoc3/htmlgenerator.cpp b/tools/qdoc3/htmlgenerator.cpp
index ebc2713..a3156c3 100644
--- a/tools/qdoc3/htmlgenerator.cpp
+++ b/tools/qdoc3/htmlgenerator.cpp
@@ -219,7 +219,7 @@ HtmlGenerator::HtmlGenerator()
       threeColumnEnumValueTable(true),
       funcLeftParen("\\S(\\()"),
       myTree(0),
-      slow(false),
+      syntaxHighlighting(false),
       obsoleteLinks(false)
 {
 }
@@ -320,7 +320,7 @@ void HtmlGenerator::initializeGenerator(const Config &config)
         ++edition;
     }
 
-    slow = config.getBool(CONFIG_SLOW);
+    syntaxHighlighting = config.getBool(CONFIG_SYNTAXHIGHLIGHTING);
 
     codeIndent = config.getInt(CONFIG_CODEINDENT);
 
@@ -472,7 +472,7 @@ int HtmlGenerator::generateAtom(const Atom *atom,
             out() << protectEnc(plainCode(atom->string()));
         }
         else {
-            out() << highlightedCode(atom->string(), marker, relative);
+            out() << protectEnc(plainCode(atom->string()));
         }
         out() << formattingRightMap()[ATOM_FORMATTING_TELETYPE];
         break;
@@ -2781,7 +2781,7 @@ QString HtmlGenerator::highlightedCode(const QString& markedCode,
     }
 
 
-    if (slow) {
+    if (syntaxHighlighting) {
         // is this block ever used at all?
         // replace all <@func> tags: "(<@func target=\"([^\"]*)\">)(.*)(</@func>)"
         src = html;