Revert "QDoc: Remove unused code"

This reverts commit e6d86264bc145fe543bcfe534737f6c7fb7f584d.

Reason for revert: The instance of the empty PlainCodeMarker
class is used by logic that expects a CodeMarker as the last
element in the CodeMarker::markers list. Removing this class
thus resulted in undefined behavior and random hangs running
QDoc.

Change-Id: Ifb17d0eba784efaa6e29e10607a85bf824ab3469
Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
 

2 files changed, 8 insertions, 0 deletions

diff --git a/src/qdoc/codemarker.h b/src/qdoc/codemarker.h
index dcd8e61bb..c7f58ab42 100644
--- a/src/qdoc/codemarker.h
+++ b/src/qdoc/codemarker.h
@@ -89,6 +89,13 @@ private:
     static QList<CodeMarker *> markers;
 };
 
+class PlainCodeMarker : public CodeMarker
+{
+ public:
+    PlainCodeMarker() { }
+    ~PlainCodeMarker() { }
+};
+
 QT_END_NAMESPACE
 
 #endif
diff --git a/src/qdoc/main.cpp b/src/qdoc/main.cpp
index 2eaf0577d..db986b6fc 100644
--- a/src/qdoc/main.cpp
+++ b/src/qdoc/main.cpp
@@ -553,6 +553,7 @@ int main(int argc, char **argv)
       Create code markers for plain text, C++,
       javascript, and QML.
      */
+    PlainCodeMarker plainMarker;
     CppCodeMarker cppMarker;
     JsCodeMarker jsMarker;
     QmlCodeMarker qmlMarker;