Differential D5392

Fix build with Qt 5.9
ClosedPublic
Actions

Authored by apol on Apr 10 2017, 10:13 PM.

Details

Reviewers
kfunk
Group Reviewers
Frameworks
Commits
R313:2d9c893adef9: Fix build with Qt 5.9
Summary

Otherwise we get the following error:
/home/apol/devel/frameworks/khtml/src/khtml_factory.h:31: Error: Plugin Metadata file "" could not be opened: file to open is a directory

Arguably it's something to fix upstream, but also having FILE "" doesn't add
much either.

BUG: 377490

Test Plan

Now it compiles, tests pass, khelpcenter runs.

Diff Detail

Repository
R313 KHtml
Branch
master
Lint
No Linters Available
Unit
No Unit Test Coverage
apol created this revision.Apr 10 2017, 10:13 PM
Restricted Application added a project: Frameworks. · View Herald TranscriptApr 10 2017, 10:13 PM
Restricted Application added a subscriber: Frameworks. · View Herald Transcript
apol added a reviewer: Frameworks.Apr 10 2017, 10:14 PM

I would appreciate if someone could test it on earlier versions of Qt.

ltoscano added a subscriber: ltoscano.Apr 10 2017, 10:20 PM

Please add a reference to https://bugs.kde.org/show_bug.cgi?id=377490, which is exactly this issue.

mpyne added a subscriber: mpyne.Apr 10 2017, 11:51 PM

I can confirm that the patch works with KHTML built on Qt 5.8.1, and that Konqueror still finds KHTML fine after.

kfunk accepted this revision.Apr 11 2017, 6:35 AM
This revision is now accepted and ready to land.Apr 11 2017, 6:35 AM
ltoscano edited the summary of this revision. (Show Details)Apr 11 2017, 6:47 AM
Closed by commit R313:2d9c893adef9: Fix build with Qt 5.9 (authored by apol). · Explain WhyApr 13 2017, 1:03 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Msrc/khtml_factory.h (2 lines)

Diff 13311

View Options

src/khtml_factory.h

Loading...