Review Request 119164: khtml: install kxmlgui .rc files into KXMLGUI_INSTALL_DIR (= share/kxmlgui5)

[David Faure]

> On July 10, 2014, 6:07 a.m., Marko Käning wrote:
> > Hi David,
> > 
> > it turns out that this lets the rc file indeed go into the "/Library/Application Support/khtml" folder here on the OSX/CI system:
> > ---
> > $ ls -1 /opt/kde/install/darwin/mavericks/clang/kf5-qt5/frameworks/khtml/inst/Library/Application\ Support/khtml
> > khtml5.rc
> > khtml5_browser.rc
> > ---
> > 
> > But I want to underline, that for khtml files get installed in two parallel folders, i.e.  
> > ---
> > $ ls -R /opt/kde/install/darwin/mavericks/clang/kf5-qt5/frameworks/khtml/inst/Library/Application\ Support/
> > .:
> > kf5  khtml
> > 
> > ./kf5:
> > khtml  kjava
> > 
> > ./kf5/khtml:
> > css  error.html
> > 
> > ./kf5/khtml/css:
> > html4.css  presentational.css  quirks.css
> > 
> > ./kf5/kjava:
> > kjava.jar  kjava.policy  pluginsinfo
> > 
> > ./khtml:
> > khtml5.rc  khtml5_browser.rc  
> > ---
> > 
> > Well, I am still unsure whether the rc files in khtml could/should not also go to kf5/khtml... Probably not, right?
> > 
> > Greets,
> > Marko

You're describing the situation WITHOUT this patch.
With this patch, khtml.rc and khtml_browser.rc  (no '5' anymore) get installed to share/kxmlgui5 or whereever your KXMLGUI_INSTALL_DIR points to.

kf5/khtml wouldn't work for kxmlgui files, we've been over this already.


- David


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


On July 7, 2014, 7:17 p.m., David Faure wrote:
> 
> -----------------------------------------------------------
> This is an automatically generated e-mail. To reply, visit:
> https://git.reviewboard.kde.org/r/119164/
> -----------------------------------------------------------
> 
> (Updated July 7, 2014, 7:17 p.m.)
> 
> 
> Review request for KDE Frameworks, Jonathan Riddell, Marko Käning, and Martin Tobias Holmedahl Sandsmark.
> 
> 
> Repository: khtml
> 
> 
> Description
> -------
> 
> khtml: install kxmlgui .rc files into KXMLGUI_INSTALL_DIR (= share/kxmlgui5)
> 
> This removes the need to version the file themselves, so revert that.
> 
> 
> Diffs
> -----
> 
>   src/CMakeLists.txt fe4f49e5799f6b8781eebb217c49b9171600e2f3 
>   src/khtml_part.cpp d7dcb92619d1ba69f015b3a48d9b352f40241196 
> 
> Diff: https://git.reviewboard.kde.org/r/119164/diff/
> 
> 
> Testing
> -------
> 
> testkhtml still has menus (even after removing the old files)
> 
> 
> Thanks,
> 
> David Faure
> 
>

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.kde.org/pipermail/kde-frameworks-devel/attachments/20140710/bae37bb3/attachment-0001.html>