[PATCH] Re: Transition WebKit to WebEngine
Robert Helling
helling at atdotde.de
Fri Dec 30 10:49:38 PST 2016
Hi,
-------------- next part --------------
An embedded and charset-unspecified text was scrubbed...
Name: 0001-Start-transition-from-QWebKit-to-QWebEngine.txt
URL: <http://lists.subsurface-divelog.org/pipermail/subsurface/attachments/20161230/38fb7a3e/attachment-0001.txt>
-------------- next part --------------
> On 30 Dec 2016, at 11:28, Anton Lundin <glance at acc.umu.se> wrote:
>
>
> 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.
Oops.
>
>> 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.
Here is that patch reworked in the way you suggested:
Besides the manual picture glitch, it adds a cmake config variables USE_WEBENGINE. If that is off, this patch should be a no-op, if it is on, it eliminates WebKit in favour of WebEngine (at the price of making printing dysfunctional).
This should be a) harmless to merge (at this stage) and b) a good starting point for the transition to Qt 5.7
Best
Robert
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 496 bytes
Desc: Message signed with OpenPGP using GPGMail
URL: <http://lists.subsurface-divelog.org/pipermail/subsurface/attachments/20161230/38fb7a3e/attachment-0001.sig>
More information about the subsurface
mailing list