Use QTWEBENGINE_VERSION not QT_VERSION for WebEngine feature detection
ClosedPublic

Authored by tcberner on Jul 6 2019, 3:06 PM.

Details

Summary

FreeBSD's Qt5WebEngine version is not in sync with the Qt5-version.
Therefore check the version we actually care about here.

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.
tcberner created this revision.Jul 6 2019, 3:06 PM
Restricted Application added a project: KDE PIM. · View Herald TranscriptJul 6 2019, 3:06 PM
Restricted Application added a subscriber: kde-pim. · View Herald Transcript
tcberner requested review of this revision.Jul 6 2019, 3:06 PM
vkrause accepted this revision.Jul 6 2019, 3:23 PM
This revision is now accepted and ready to land.Jul 6 2019, 3:23 PM
This revision was automatically updated to reflect the committed changes.
wbauer added a subscriber: wbauer.Jul 6 2019, 10:29 PM

This doesn't work as intended (at least here on openSUSE).
I just built it with QtWebEngine 5.13(.0), and it incorrectly took the < 5.13.0 branch.

AFAICT, you need to #include <QtWebEngine/QtWebEngineVersion> so that QTWEBENGINE_VERSION is actually defined...

But as QWebEngineProfile is actually part of QtWebEngineWidgets, it would probably be more correct to test QTWEBENGINEWIDGETS_VERSION instead (and #include <QtWebEngineWidgetsVersion>).

wbauer added a comment.Jul 7 2019, 9:03 AM

Nevermind though, lmontel fixed it meanwhile with commit 7b3249547b92.