Review Request 114697: KStandardDirs: special case for xdgdata-apps

[Alex Merry]

-----------------------------------------------------------
This is an automatically generated e-mail. To reply, visit:
https://git.reviewboard.kde.org/r/114697/
-----------------------------------------------------------

(Updated Dec. 28, 2013, 12:42 p.m.)


Status
------

This change has been marked as submitted.


Review request for KDE Frameworks and David Faure.


Repository: kde4support


Description
-------

For resourceDirs("xdgdata-apps"), we do not use
installPath("xdgdata-apps") as the fallback (which is probably a
subdirectory of CMAKE_INSTALL_PREFIX/share/applications/), but instead
use CMAKE_INSTALL_PREFIX/share/applications/ directly.

In a sensible installation, this should make no difference, because if
XDG_DATA_DIRS is set to include CMAKE_INSTALL_PREFIX/share, and that
directory contains an applications directory, the result of
installPath("xdgdata-apps") is never used.  However, this will (a) act
as a bit of a safety blanket for people who set XDG_DATA_DIRS wrong and
(b) allow the tests to pass on Jenkins, which installs kde4support to
its own directory (which then does not have a share/applications
subdirectory).


Diffs
-----

  src/kdecore/kstandarddirs.cpp f9a29cd0e1c91861afe2a47eacac2f006248af54 

Diff: https://git.reviewboard.kde.org/r/114697/diff/


Testing
-------

The kstandarddirs unit test now passes whether or not CMAKE_INSTALL_PREFIX/share/applications exists or not.


Thanks,

Alex Merry

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.kde.org/pipermail/kde-frameworks-devel/attachments/20131228/2eafdc66/attachment.html>