From kde-frameworks-devel Thu Jul 10 06:07:37 2014 From: =?utf-8?q?Marko_K=C3=A4ning?= Date: Thu, 10 Jul 2014 06:07:37 +0000 To: kde-frameworks-devel Subject: Re: Review Request 119164: khtml: install kxmlgui .rc files into KXMLGUI_INSTALL_DIR (= share/kxmlgu Message-Id: <20140710060737.19520.88136 () probe ! kde ! org> X-MARC-Message: https://marc.info/?l=kde-frameworks-devel&m=140497247819965 MIME-Version: 1 Content-Type: multipart/mixed; boundary="--===============7918204029164660331==" --===============7918204029164660331== Content-Type: multipart/alternative; boundary="===============0827327955031057922==" --===============0827327955031057922== MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 8bit ----------------------------------------------------------- This is an automatically generated e-mail. To reply, visit: https://git.reviewboard.kde.org/r/119164/#review62039 ----------------------------------------------------------- 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 - Marko Käning On July 7, 2014, 9: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, 9: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 > > --===============0827327955031057922== MIME-Version: 1.0 Content-Type: text/html; charset="utf-8" Content-Transfer-Encoding: 8bit

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

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

- Marko Käning

On July 7th, 2014, 9:17 p.m. CEST, David Faure wrote:

Review request for KDE Frameworks, Jonathan Riddell, Marko Käning, and Martin Tobias Holmedahl Sandsmark.

By David Faure.

Updated July 7, 2014, 9:17 p.m.

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.

Testing

testkhtml still has menus (even after removing the old files)

Diffs

src/CMakeLists.txt (fe4f49e5799f6b8781eebb217c49b9171600e2f3)
src/khtml_part.cpp (d7dcb92619d1ba69f015b3a48d9b352f40241196)

--===============0827327955031057922==-- --===============7918204029164660331== Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Kde-frameworks-devel mailing list Kde-frameworks-devel@kde.org https://mail.kde.org/mailman/listinfo/kde-frameworks-devel --===============7918204029164660331==--