Differential D15832

fixed build for qt versions < 5.11
ClosedPublic
Actions

Authored by anmolgautam on Sep 29 2018, 1:59 PM.

Details

Reviewers
drosca
Commits
R875:7c570c93dbc6: fixed build for qt versions < 5.11
Summary

Build is broken because QWebEngineRequestJob::initiator is added in 5.11. This patch fixes the build with Qt < 5.11.

Diff Detail

Repository
R875 Falkon
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.
anmolgautam created this revision.Sep 29 2018, 1:59 PM
Restricted Application added a project: Falkon. · View Herald TranscriptSep 29 2018, 1:59 PM
Restricted Application added a subscriber: falkon. · View Herald Transcript
anmolgautam requested review of this revision.Sep 29 2018, 1:59 PM
drosca requested changes to this revision.Sep 29 2018, 2:23 PM

Also please fix build on FreeBSD: https://build.kde.org/job/Extragear/job/falkon/job/kf5-qt5%20FreeBSDQt5.11/6/console

src/lib/plugins/qml/api/extensionscheme/qmlwebengineurlrequestjob.cpp
62

Just make it return empty QString when built against QtWebEngine < 5.11.
Also it should check the QtWebEngine version, not QT_VERSION.

This revision now requires changes to proceed.Sep 29 2018, 2:23 PM
anmolgautam updated this revision to Diff 42554.Sep 29 2018, 3:06 PM
  • fixed build when HAVE_LIBINTL is FALSE, also fixed warnings
drosca accepted this revision.Sep 29 2018, 3:08 PM

Translations should work on FreeBSD though, so please fix it another commit.

This revision is now accepted and ready to land.Sep 29 2018, 3:08 PM
Closed by commit R875:7c570c93dbc6: fixed build for qt versions < 5.11 (authored by anmolgautam). · Explain WhySep 29 2018, 3:15 PM
This revision was automatically updated to reflect the committed changes.

Showing Only Differences

This revision modifies 3 more files that are hidden because they were not modified between selected diffs and they have no inline comments.

Revision Contents
Changeset List

Diff 42556

View Options

src/lib/plugins/qml/api/extensionscheme/qmlwebengineurlrequestjob.cpp

Loading...