On 10 August, 2016 - Robert Helling wrote: > This removes all references to WebKit. 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 FB support appears to be disabled > for me. > > 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). >
This WebKit -> WebEngine came up, so I took a closer look at this code. > --- > Documentation/mobile-images/DiveList.jpg | Bin 49073 -> 51854 bytes This looks like some thing that accidently got included in this patch. > cmake/Modules/HandleUserManual.cmake | 4 +- > .../plugins/facebook/facebookconnectwidget.cpp | 9 +- > .../plugins/facebook/facebookconnectwidget.h | 6 +- > desktop-widgets/printer.cpp | 224 > +++++++++++---------- > desktop-widgets/printer.h | 4 +- > desktop-widgets/usermanual.cpp | 42 ++-- > desktop-widgets/usermanual.h | 28 ++- > 8 files changed, 177 insertions(+), 140 deletions(-) .. > diff --git a/cmake/Modules/HandleUserManual.cmake > b/cmake/Modules/HandleUserManual.cmake > index 6e4874c..8ef2a87 100644 > --- a/cmake/Modules/HandleUserManual.cmake > +++ b/cmake/Modules/HandleUserManual.cmake > @@ -2,6 +2,6 @@ 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) > + list(APPEND QT_EXTRA_COMPONENTS WebEngineWidgets) > + list(APPEND QT_EXTRA_LIBRARIES Qt5::WebEngineWidgets) > endif() Could you rework this patch so we could use a option to use WebEngine intead of WebKit in Facebook-tingie and Usermanual? That way we can start to transition smoothly. //Anton -- Anton Lundin +46702-161604 _______________________________________________ subsurface mailing list [email protected] http://lists.subsurface-divelog.org/cgi-bin/mailman/listinfo/subsurface
