Fix CMakeLists.txt to compile WebEnginePartHtmlEmbedder on Qt before Qt-5.12
authorStefano Crocco <stefano.crocco@alice.it>
Thu, 25 Jul 2019 09:37:51 +0000 (11:37 +0200)
committerPino Toscano <pino@debian.org>
Sat, 12 Oct 2019 18:26:50 +0000 (19:26 +0100)
When compiling Konqueror on versions of Qt before 5.12, the
WebEnginePartHtmlEmbedder class is needed to embed local contents in pages
generated by...

Summary:
...WebEnginePartKIOHandler (for example, for the man protocol). The
corresponding source file is added to the the list of source files only if the
Qt version is less than 5.12. However, an extra command in CMakeFiles.txt caused
the file not to be added and the compilation to fail.

Test Plan:
compile Konqueror with Qt older than 5.12.0: the compilation now
completes successfully.

Reviewers: dfaure

Reviewed By: dfaure

Differential Revision: https://phabricator.kde.org/D22736

(cherry picked from commit f9bc950d257f8c7bf30feac5ba9c21de32e4e452)

Gbp-Pq: Name upstream_Fix-CMakeLists.txt-to-compile-WebEnginePartHtmlEmbed.patch

webenginepart/src/CMakeLists.txt

index eb97a16011fef791e7d4c5fd23de22e83dcf9564..6a513766bd98d6f6cf597b2739c62e3cc279e785 100644 (file)
@@ -31,7 +31,7 @@ if(NOT Qt5WebEngineWidgets_VERSION VERSION_LESS "5.12.0")
   add_definitions(-DUSE_QWEBENGINE_URL_SCHEME)
   add_definitions(-DDOWNLOADITEM_KNOWS_PAGE)
 else()
-  list(APPEND kwebenginepartlib_LIB_SRCS, webengineparthtmlembedder.cpp)
+  list(APPEND kwebenginepartlib_LIB_SRCS webengineparthtmlembedder.cpp)
 endif()
 
 qt5_wrap_ui(kwebenginepartlib_LIB_SRCS