diff options
| author | Paul Wicking <paul.wicking@qt.io> | 2019-06-20 12:27:14 +0000 |
|---|---|---|
| committer | Paul Wicking <paul.wicking@qt.io> | 2019-06-20 12:27:14 +0000 |
| commit | 2750a510d2f8ef34219906939e5ccb804b9a39d3 (patch) | |
| tree | ec0b2d666162a420b493a50b03edd1eb6b6d27bc /src/qdoc/main.cpp | |
| parent | e6d86264bc145fe543bcfe534737f6c7fb7f584d (diff) | |
| download | qttools-2750a510d2f8ef34219906939e5ccb804b9a39d3.tar.gz | |
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>
Diffstat (limited to 'src/qdoc/main.cpp')
| -rw-r--r-- | src/qdoc/main.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
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; |