Port to Qt WebEngine (fixes Windows build) #5
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
The Qt WebKit Widgets API has both a QWebPage and a QWebView class. Counterintuitively, WebPage inherits from QWebView. The port to Qt WebEngine Widgets will require subclassing the counterparts of both classes, so rename now to avoid more confusion in the future.
WebView had two ctors, one for when the page should be loaded directly from a URL and one when the URL was to be combined with a search query first. Both had lots of common code that was clumped together with loading code that doesn't belong in a ctor. This change makes it so there's a single ctor and loading has to be explicitly initiated by calling load(). Still far from pretty, but removes lots of redundancy.
For displaying web pages, qolibri was using the Qt WebKit library, which was removed years ago with Qt 5.6. These days it's pretty much only still available on GNU/Linux and the BSDs, where distros maintain it to keep old apps working for now. This change ports to Qt WebKit's Chromium-based successor Qt WebEngine. Among other things, this fixes Windows builds (only tested with official prebuilt Qt 5.11.2 on Windows 10 x64 with VS2017 compiler).
|
Thanks so much for fixing this and sending the PR. I didn't see any regressions on Debian, so I am going to push a commit with this merged shortly. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
(Relates to #4)
For displaying web pages, qolibri was using the Qt WebKit library, which
was removed years ago with Qt 5.6. These days it's pretty much only
still available on GNU/Linux and the BSDs, where distros maintain it to
keep old apps working for now.
This PR ports to Qt WebKit's Chromium-based successor Qt WebEngine.
Among other things, this fixes Windows builds (only tested with official
prebuilt Qt 5.11.2 on Windows 10 x64 with VS2017 compiler):