diff options
| author |  Robert C. Helling <helling@atdotde.de> | 2016-08-09 00:12:12 +0200 |
|---|---|---|
| committer | Robert C. Helling <helling@atdotde.de> | 2016-12-30 19:43:00 +0100 |
| commit | 529a4d499b8dad35de6cd43e3004017ccfd288aa (patch) | |
| tree | fb0f163c32c029134a849ac49183849870b3c0ae /cmake | |
| parent | 10b8bda6626fe1de602e38da34de419972031755 (diff) | |
| download | subsurface-529a4d499b8dad35de6cd43e3004017ccfd288aa.tar.gz | |
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 <helling@atdotde.de>
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/Modules/HandleUserManual.cmake | 11 |
1 files changed, 9 insertions, 2 deletions
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() |