From 121e563052d3ba83e758ade8884003826e269297 Mon Sep 17 00:00:00 2001
From: Eike Ziller <eike.ziller@qt.io>
Date: Tue, 22 Dec 2020 14:41:11 +0100
Subject: [PATCH] Update litehtml to latest master

Adds support for ordered lists.

Change-Id: I467689cdad08df297b20fbffe02d217d117ed56f
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
---
 src/plugins/help/qlitehtml/CMakeLists.txt | 14 --------------
 src/plugins/help/qlitehtml/litehtml       |  2 +-
 src/plugins/help/qlitehtml/qlitehtml.pri  |  4 ++++
 src/plugins/help/qlitehtml/qlitehtml.qbs  |  4 ++++
 4 files changed, 9 insertions(+), 15 deletions(-)

diff --git a/src/plugins/help/qlitehtml/CMakeLists.txt b/src/plugins/help/qlitehtml/CMakeLists.txt
index 5c7957a88c5..f6227a8f4c5 100644
--- a/src/plugins/help/qlitehtml/CMakeLists.txt
+++ b/src/plugins/help/qlitehtml/CMakeLists.txt
@@ -5,21 +5,7 @@ if (EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/litehtml/CMakeLists.txt)
     endif()
     set(CMAKE_POSITION_INDEPENDENT_CODE ON)
 
-    # suppress warning about VERSION being overwritten or not
-    # and add subdirectory
-    set(ORIG_VERSION ${PROJECT_VERSION})
-    set(ORIG_MAJOR ${PROJECT_VERSION_MAJOR})
-    set(ORIG_MINOR ${PROJECT_VERSION_MINOR})
-    set(ORIG_PATCH ${PROJECT_VERSION_PATCH})
-    set(PROJECT_VERSION "")
-    set(PROJECT_VERSION_MAJOR "")
-    set(PROJECT_VERSION_MINOR "")
-    set(PROJECT_VERSION_PATCH "")
     add_subdirectory(litehtml EXCLUDE_FROM_ALL)
-    set(PROJECT_VERSION ${ORIG_VERSION})
-    set(PROJECT_VERSION_MAJOR ${ORIG_MAJOR})
-    set(PROJECT_VERSION_MINOR ${ORIG_MINOR})
-    set(PROJECT_VERSION_PATCH ${ORIG_PATCH})
 
     set(CMAKE_POSITION_INDEPENDENT_CODE "${ORIG_FPIC}")
     # force optimized litehtml even in debug
diff --git a/src/plugins/help/qlitehtml/litehtml b/src/plugins/help/qlitehtml/litehtml
index 816730ff1f9..db7f59d5886 160000
--- a/src/plugins/help/qlitehtml/litehtml
+++ b/src/plugins/help/qlitehtml/litehtml
@@ -1 +1 @@
-Subproject commit 816730ff1f94201dc7ea8189c81ab9f404abc941
+Subproject commit db7f59d5886fd50f84d48720c79dc2e6152efa83
diff --git a/src/plugins/help/qlitehtml/qlitehtml.pri b/src/plugins/help/qlitehtml/qlitehtml.pri
index 794f8d124ca..c5cfc42baab 100644
--- a/src/plugins/help/qlitehtml/qlitehtml.pri
+++ b/src/plugins/help/qlitehtml/qlitehtml.pri
@@ -65,6 +65,7 @@ exists($$PWD/litehtml/CMakeLists.txt) {
         $$LH_SRC/src/element.cpp \
         $$LH_SRC/src/el_font.cpp \
         $$LH_SRC/src/el_image.cpp \
+        $$LH_SRC/src/el_li.cpp \
         $$LH_SRC/src/el_link.cpp \
         $$LH_SRC/src/el_para.cpp \
         $$LH_SRC/src/el_script.cpp \
@@ -79,6 +80,7 @@ exists($$PWD/litehtml/CMakeLists.txt) {
         $$LH_SRC/src/html_tag.cpp \
         $$LH_SRC/src/iterators.cpp \
         $$LH_SRC/src/media_query.cpp \
+        $$LH_SRC/src/num_cvt.cpp \
         $$LH_SRC/src/style.cpp \
         $$LH_SRC/src/stylesheet.cpp \
         $$LH_SRC/src/table.cpp \
@@ -108,6 +110,7 @@ exists($$PWD/litehtml/CMakeLists.txt) {
         $$LH_HDR/el_div.h \
         $$LH_HDR/el_font.h \
         $$LH_HDR/el_image.h \
+        $$LH_HDR/el_li.h \
         $$LH_HDR/el_link.h \
         $$LH_HDR/el_para.h \
         $$LH_HDR/el_script.h \
@@ -123,6 +126,7 @@ exists($$PWD/litehtml/CMakeLists.txt) {
         $$LH_HDR/html_tag.h \
         $$LH_HDR/iterators.h \
         $$LH_HDR/media_query.h \
+        $$LH_HDR/num_cvt.h \
         $$LH_HDR/os_types.h \
         $$LH_HDR/style.h \
         $$LH_HDR/stylesheet.h \
diff --git a/src/plugins/help/qlitehtml/qlitehtml.qbs b/src/plugins/help/qlitehtml/qlitehtml.qbs
index 38ae6397f88..823e7be6bef 100644
--- a/src/plugins/help/qlitehtml/qlitehtml.qbs
+++ b/src/plugins/help/qlitehtml/qlitehtml.qbs
@@ -136,6 +136,7 @@ Product {
             "element.cpp",
             "el_font.cpp",
             "el_image.cpp",
+            "el_li.cpp",
             "el_link.cpp",
             "el_para.cpp",
             "el_script.cpp",
@@ -150,6 +151,7 @@ Product {
             "html_tag.cpp",
             "iterators.cpp",
             "media_query.cpp",
+            "num_cvt.cpp",
             "style.cpp",
             "stylesheet.cpp",
             "table.cpp",
@@ -185,6 +187,7 @@ Product {
             "el_div.h",
             "el_font.h",
             "el_image.h",
+            "el_li.h",
             "el_link.h",
             "el_para.h",
             "el_script.h",
@@ -200,6 +203,7 @@ Product {
             "html_tag.h",
             "iterators.h",
             "media_query.h",
+            "num_cvt.h",
             "os_types.h",
             "style.h",
             "stylesheet.h",