Differential D6958

Fix loading of dolphinui.rc
ClosedPublic
Actions

Authored by elvisangelaccio on Jul 28 2017, 11:39 AM.

Details

Reviewers
fvogt
dfaure
Group Reviewers
Dolphin
Commits
R318:594a36783471: Fix loading of dolphinui.rc
Summary

dolphin.qrc is compiled in a static library, which means we need to
force loading with the Q_INIT_RESOURCE macro.

See http://doc.qt.io/qt-5/resources.html#using-resources-in-a-library

BUG: 382848
FIXED-IN: 17.07.90

Test Plan

Remove stale dolphinui.rc files and start dolphin with/without this patch.

Diff Detail

Repository
R318 Dolphin
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.
Restricted Application added a subscriber: Konqueror. · View Herald TranscriptJul 28 2017, 11:39 AM
fvogt accepted this revision.Jul 28 2017, 11:49 AM

Works for me, thanks!

This revision is now accepted and ready to land.Jul 28 2017, 11:49 AM
dfaure edited edge metadata.Jul 28 2017, 11:49 AM

Oh, sorry for the breakage. I'll make sure to document this trap in the guide I'm writing.
Thanks for the fix.

Closed by commit R318:594a36783471: Fix loading of dolphinui.rc (authored by elvisangelaccio). · Explain WhyJul 28 2017, 12:06 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Msrc/dolphinmainwindow.cpp (2 lines)

Diff 17321

View Options

src/dolphinmainwindow.cpp

Loading...