feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Update litehtml to latest master

Browse Source 
Adds support for ordered lists.

Change-Id: I467689cdad08df297b20fbffe02d217d117ed56f
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
This commit is contained in:
Eike Ziller
2020-12-22 14:41:11 +01:00
parent 0f9a206bd5
commit 121e563052
4 changed files with 9 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/plugins/help/qlitehtml/CMakeLists.txt
View File

@@ -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

2
src/plugins/help/qlitehtml/litehtml

Submodule src/plugins/help/qlitehtml/litehtml updated: 816730ff1f...db7f59d588

4
src/plugins/help/qlitehtml/qlitehtml.pri
View File

@@ -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 \

4
src/plugins/help/qlitehtml/qlitehtml.qbs
View File

@@ -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",