From 529a4d499b8dad35de6cd43e3004017ccfd288aa Mon Sep 17 00:00:00 2001 From: "Robert C. Helling" Date: Tue, 9 Aug 2016 00:12:12 +0200 Subject: Start transition from QWebKit to QWebEngine This removes all references to WebKit if cmake option USE_WEBKIT is enabled. For the user manual it changes it to WebEngine (seems to work for me). Similar for the Facebook connection (minus a reference to a cookie jar). This I could not test at the moment, as I wrote this on a train. Printing does not work, it is a null operation at the moment. Currently, large parts of of the printing code are commented out as there is no direct way to access page elements in WebEngine. It seems this needs to be done via Javascript (with a callback invoked). There is new functionality in WebEngine to render a view to a PDF file but this needs more work (and probably some thoughts towards page breaks). Signed-off-by: Robert C. Helling --- cmake/Modules/HandleUserManual.cmake | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) (limited to 'cmake/Modules/HandleUserManual.cmake') diff --git a/cmake/Modules/HandleUserManual.cmake b/cmake/Modules/HandleUserManual.cmake index 6e4874c60..a9354be2b 100644 --- a/cmake/Modules/HandleUserManual.cmake +++ b/cmake/Modules/HandleUserManual.cmake @@ -2,6 +2,13 @@ if(NO_USERMANUAL) message(STATUS "building without usermanual") add_definitions(-DNO_USERMANUAL) else() - list(APPEND QT_EXTRA_COMPONENTS WebKitWidgets) - list(APPEND QT_EXTRA_LIBRARIES Qt5::WebKitWidgets) + if(USE_WEBENGINE) + message(STATUS "building with QWebEngine") + list(APPEND QT_EXTRA_COMPONENTS WebEngineWidgets) + list(APPEND QT_EXTRA_LIBRARIES Qt5::WebEngineWidgets) + add_definitions(-DUSE_WEBENGINE) + else() + list(APPEND QT_EXTRA_COMPONENTS WebKitWidgets) + list(APPEND QT_EXTRA_LIBRARIES Qt5::WebKitWidgets) + endif() endif() -- cgit v1.2.3-70-g09d2