Fix the Kirigami QRC static plugin generation
ClosedPublic

Authored by mart on Aug 7 2018, 2:52 PM.

Details

Summary

This patch moves the qrc from "raw" to generated using CMake configure file and add 4 missing files.

Since some months, a few files were missing from the QRC. It worked fine on system where Kirigami is installed (and recent) because it would load them from the file system instead of static resources. However it didn't work so well on systems where an older version (or no version) are installed.

Because ActionMenuItem is has different versions depending on the Qt version, the qrc had to be dynamic. The use of absolute path was also necessary because rcc could no longer find the files because it uses the relative path from the .qrc absolute path.

Test Plan

Not much honestly, it works on my system, other might want to double check.

Diff Detail

Repository
R169 Kirigami
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 project: Kirigami. · View Herald TranscriptAug 7 2018, 2:52 PM
Restricted Application added a subscriber: plasma-devel. · View Herald Transcript
lepagevalleeemmanuel requested review of this revision.Aug 7 2018, 2:52 PM
bearsh added a subscriber: bearsh.Aug 7 2018, 2:57 PM

how is this supposed to work in a qmake based project?

how is this supposed to work in a qmake based project?

As of right now I had forgotten it had too. It will probably need another qrc and solution... Currently both CMake and qmake versions are broken because the files are missing, so it cannot be deployed. But right, qmake needs a solution too....

mart commandeered this revision.Aug 7 2018, 3:44 PM
mart added a reviewer: lepagevalleeemmanuel.
mart updated this revision to Diff 39259.Aug 7 2018, 3:50 PM
  • kirigami.qrc.in for cmake, kirigami.qrc for qmake
This revision was not accepted when it landed; it landed in state Needs Review.Aug 7 2018, 3:51 PM
This revision was automatically updated to reflect the committed changes.