----------------------------------------------------------- This is an automatically generated e-mail. To reply, visit: https://git.reviewboard.kde.org/r/114697/#review46257 -----------------------------------------------------------
Ship it! Thanks. - David Faure On Dec. 28, 2013, 12:35 p.m., Alex Merry wrote: > > ----------------------------------------------------------- > This is an automatically generated e-mail. To reply, visit: > https://git.reviewboard.kde.org/r/114697/ > ----------------------------------------------------------- > > (Updated Dec. 28, 2013, 12:35 p.m.) > > > 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 > >
_______________________________________________ Kde-frameworks-devel mailing list [email protected] https://mail.kde.org/mailman/listinfo/kde-frameworks-devel
