Put built-in holiday definitions into qrc
ClosedPublic

Authored by vkrause on Jan 27 2018, 10:48 AM.

Details

Summary

The file system is still searched in the same place as before, which can
be easier to use than qrc while working on those files. Having the data
compiled in simplifies deployment though, particularly on systems without
a standard XDG install layout.

Diff Detail

Repository
R175 KHolidays
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.
vkrause created this revision.Jan 27 2018, 10:48 AM
Restricted Application added a project: KDE PIM. · View Herald TranscriptJan 27 2018, 10:48 AM
vkrause requested review of this revision.Jan 27 2018, 10:48 AM
mlaurent accepted this revision.Jan 27 2018, 1:52 PM
mlaurent added a subscriber: mlaurent.
mlaurent added inline comments.
CMakeLists.txt
8

Just curious it's not default in ECM ? I never used it.

This revision is now accepted and ready to land.Jan 27 2018, 1:52 PM
vkrause added inline comments.Jan 27 2018, 2:04 PM
CMakeLists.txt
8

Yep, I was expecting this to be the default too, but it didn't work without explicitly enabling it.

This revision was automatically updated to reflect the committed changes.

I'm late to the game, but in general looks good.

Minor comments:

  • What's missing (or I miss something) is that it could be that entries exist twice, if in resource and on disk. Since this is not the case right now, this is probably not an issue.
  • holidays/holidays.qrc is manually maintained and not auto-generated. This is probably fine as well since we don't expect as many changes as e.g. in the syntax-highlighting repo...
  • What's missing (or I miss something) is that it could be that entries exist twice, if in resource and on disk. Since this is not the case right now, this is probably not an issue.

In that case we prefer the on-disk version, that's what the change in HolidayRegionPrivate does.

Ok, I can see that now ;) Thanks.