Check QtWebEngine version instead of Qt's
ClosedPublic

Authored by wbauer on Oct 24 2018, 10:05 AM.

Details

Summary

This code depends on the QtWebEngine (not Qt) version, so it should actually check for that.
Otherwise it breaks if a distribution ships Qt 5.9 LTS together with a newer QtWebEngine, like e.g. openSUSE Leap 15.0 does, or QtWebEngine 5.9 together with a newer Qt as is the case in FreeBSD.

BUG: 397349
CCBUG: 388440

Test Plan

Compiled messagelib with the following combinations:

  1. Qt 5.9.4/QtWebEngine 5.9.4
  2. Qt 5.11.2/QtWebEngine 5.11.2
  3. Qt 5.9.4/QtWebEngine 5.10.1

In each case, the intended code path is taken now, i.e. it returns document.body.scrollTop in the first case document.documentElement.scrollTop for the others.

Also tested it on a real openSUSE Leap 15.0 installation (which comes with Qt 5.9.4 and QtWebEngine 5.10.1), PgUp/PgDown works fine now, it only worked once before.

Diff Detail

Repository
R94 PIM: Message Library
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.
wbauer created this revision.Oct 24 2018, 10:05 AM
Restricted Application added a project: KDE PIM. · View Herald TranscriptOct 24 2018, 10:05 AM
Restricted Application added a subscriber: kde-pim. · View Herald Transcript
wbauer requested review of this revision.Oct 24 2018, 10:05 AM
wbauer edited the summary of this revision. (Show Details)Oct 24 2018, 10:09 AM

Cool, this should also benefit FreeBSD, where we have
Qt 5.11.2/QtWebengine 5.9.4

Cool, this should also benefit FreeBSD, where we have
Qt 5.11.2/QtWebengine 5.9.4

Should be, yes (though I haven't tested this combination).

It actually is mentioned as still being broken in FreeBSD in https://bugs.kde.org/show_bug.cgi?id=388440, so I suppose I should add that as CCBUG...

wbauer edited the summary of this revision. (Show Details)Oct 24 2018, 5:03 PM
mlaurent accepted this revision.Oct 24 2018, 8:13 PM
This revision is now accepted and ready to land.Oct 24 2018, 8:13 PM
This revision was automatically updated to reflect the committed changes.