Fix build with QtWebEngine 5.6
ClosedPublic

Authored by wbauer on Apr 19 2019, 8:50 AM.

Details

Reviewers
cgilles
Group Reviewers
Digikam
Summary

These two attributes were added in 5.7, so don't try to set them when compiling with 5.6.

Test Plan

Builds fine now with Qt and QtWebEngine 5.6.2 (with -DENABLE_QWEBENGINE=ON), previously there were compiler errors like this:

/home/abuild/rpmbuild/BUILD/digikam-6.1.0/core/libs/dplugins/webservices/webwidget_qwebengine.cpp:54:50: error: 'WebGLEnabled' is not a member of 'QWebEngineSettings'
     settings()->setAttribute(QWebEngineSettings::WebGLEnabled, false);
                                                  ^~~~~~~~~~~~
/home/abuild/rpmbuild/BUILD/digikam-6.1.0/core/libs/dplugins/webservices/webwidget_qwebengine.cpp:55:50: error: 'Accelerated2dCanvasEnabled' is not a member of 'QWebEngineSettings'
     settings()->setAttribute(QWebEngineSettings::Accelerated2dCanvasEnabled, false);
                                                  ^~~~~~~~~~~~~~~~~~~~~~~~~~

Still builds fine with later versions, and/or without -DENABLE_QWEBENGINE=ON.

Diff Detail

Repository
R482 digiKam
Lint
Lint Skipped
Unit
Unit Tests Skipped
wbauer requested review of this revision.Apr 19 2019, 8:50 AM
wbauer created this revision.
wbauer edited the test plan for this revision. (Show Details)

PS: I just now found the same in core/dplugins/generic/webservices/unified/wizard/wsauthenticationpage.cpp, but that isn't compiled currently.

This revision is now accepted and ready to land.Apr 19 2019, 12:56 PM
cgilles closed this revision.Apr 19 2019, 12:56 PM