[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-frameworks-devel
Subject: Re: Review Request 119164: khtml: install kxmlgui .rc files into KXMLGUI_INSTALL_DIR (= share/kxmlgu
From: "David Faure" <faure () kde ! org>
Date: 2014-07-10 9:06:29
Message-ID: 20140710090629.19519.47675 () probe ! kde ! org
[Download RAW message or body]
--===============5596849410439179562==
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: 8bit
> 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
>
>
--===============5596849410439179562==
MIME-Version: 1.0
Content-Type: text/html; charset="utf-8"
Content-Transfer-Encoding: 8bit
<html>
<body>
<div style="font-family: Verdana, Arial, Helvetica, Sans-Serif;">
<table bgcolor="#f9f3c9" width="100%" cellpadding="12" style="border: 1px #c9c399 \
solid; border-radius: 6px; -moz-border-radius: 6px; -webkit-border-radius: 6px;"> \
<tr> <td>
This is an automatically generated e-mail. To reply, visit:
<a href="https://git.reviewboard.kde.org/r/119164/">https://git.reviewboard.kde.org/r/119164/</a>
</td>
</tr>
</table>
<br />
<blockquote style="margin-left: 1em; border-left: 2px solid #d0d0d0; padding-left: \
10px;"> <p style="margin-top: 0;">On July 10th, 2014, 6:07 a.m. UTC, <b>Marko \
Käning</b> wrote:</p> <blockquote style="margin-left: 1em; border-left: 2px solid \
#d0d0d0; padding-left: 10px;"> <pre style="white-space: pre-wrap; white-space: \
-moz-pre-wrap; white-space: -pre-wrap; white-space: -o-pre-wrap; word-wrap: \
break-word;"><p style="padding: 0;text-rendering: inherit;margin: 0;line-height: \
inherit;white-space: inherit;">Hi David,</p> <h2 style="font-size: \
100%;text-rendering: inherit;padding: 0;white-space: normal;margin: 0;line-height: \
inherit;">it turns out that this lets the rc file indeed go into the \
"/Library/Application Support/khtml" folder here on the OSX/CI system:</h2> <p \
style="padding: 0;text-rendering: inherit;margin: 0;line-height: inherit;white-space: \
inherit;">$ ls -1 /opt/kde/install/darwin/mavericks/clang/kf5-qt5/frameworks/khtml/inst/Library/Application\ \
Support/khtml<br style="padding: 0;text-rendering: inherit;margin: 0;line-height: \
inherit;white-space: normal;" /> khtml5.rc<br style="padding: 0;text-rendering: \
inherit;margin: 0;line-height: inherit;white-space: normal;" /> khtml5_browser.rc</p>
<hr style="text-rendering: inherit;margin: 0;padding: 0;white-space: normal;border: \
1px solid #ddd;line-height: inherit;" /> <h2 style="font-size: 100%;text-rendering: \
inherit;padding: 0;white-space: normal;margin: 0;line-height: inherit;">But I want to \
underline, that for khtml files get installed in two parallel folders, i.e.</h2> <p \
style="padding: 0;text-rendering: inherit;margin: 0;line-height: inherit;white-space: \
inherit;">$ ls -R /opt/kde/install/darwin/mavericks/clang/kf5-qt5/frameworks/khtml/inst/Library/Application\ \
Support/<br style="padding: 0;text-rendering: inherit;margin: 0;line-height: \
inherit;white-space: normal;" />
.:<br style="padding: 0;text-rendering: inherit;margin: 0;line-height: \
inherit;white-space: normal;" /> kf5 khtml</p>
<p style="padding: 0;text-rendering: inherit;margin: 0;line-height: \
inherit;white-space: inherit;">./kf5:<br style="padding: 0;text-rendering: \
inherit;margin: 0;line-height: inherit;white-space: normal;" /> khtml kjava</p>
<p style="padding: 0;text-rendering: inherit;margin: 0;line-height: \
inherit;white-space: inherit;">./kf5/khtml:<br style="padding: 0;text-rendering: \
inherit;margin: 0;line-height: inherit;white-space: normal;" /> css error.html</p>
<p style="padding: 0;text-rendering: inherit;margin: 0;line-height: \
inherit;white-space: inherit;">./kf5/khtml/css:<br style="padding: 0;text-rendering: \
inherit;margin: 0;line-height: inherit;white-space: normal;" /> html4.css \
presentational.css quirks.css</p> <p style="padding: 0;text-rendering: \
inherit;margin: 0;line-height: inherit;white-space: inherit;">./kf5/kjava:<br \
style="padding: 0;text-rendering: inherit;margin: 0;line-height: inherit;white-space: \
normal;" /> kjava.jar kjava.policy pluginsinfo</p>
<p style="padding: 0;text-rendering: inherit;margin: 0;line-height: \
inherit;white-space: inherit;">./khtml:<br style="padding: 0;text-rendering: \
inherit;margin: 0;line-height: inherit;white-space: normal;" /> khtml5.rc \
khtml5_browser.rc </p> <hr style="text-rendering: inherit;margin: 0;padding: \
0;white-space: normal;border: 1px solid #ddd;line-height: inherit;" /> <p \
style="padding: 0;text-rendering: inherit;margin: 0;line-height: inherit;white-space: \
inherit;">Well, I am still unsure whether the rc files in khtml could/should not also \
go to kf5/khtml... Probably not, right?</p> <p style="padding: 0;text-rendering: \
inherit;margin: 0;line-height: inherit;white-space: inherit;">Greets,<br \
style="padding: 0;text-rendering: inherit;margin: 0;line-height: inherit;white-space: \
normal;" /> Marko</p></pre>
</blockquote>
</blockquote>
<pre style="white-space: pre-wrap; white-space: -moz-pre-wrap; white-space: \
-pre-wrap; white-space: -o-pre-wrap; word-wrap: break-word;"><p style="padding: \
0;text-rendering: inherit;margin: 0;line-height: inherit;white-space: \
inherit;">You're describing the situation WITHOUT this patch.<br style="padding: \
0;text-rendering: inherit;margin: 0;line-height: inherit;white-space: normal;" /> \
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.</p> <p \
style="padding: 0;text-rendering: inherit;margin: 0;line-height: inherit;white-space: \
inherit;">kf5/khtml wouldn't work for kxmlgui files, we've been over this \
already.</p></pre> <br />
<p>- David</p>
<br />
<p>On July 7th, 2014, 7:17 p.m. UTC, David Faure wrote:</p>
<table bgcolor="#fefadf" width="100%" cellspacing="0" cellpadding="12" style="border: \
1px #888a85 solid; border-radius: 6px; -moz-border-radius: 6px; \
-webkit-border-radius: 6px;"> <tr>
<td>
<div>Review request for KDE Frameworks, Jonathan Riddell, Marko Käning, and Martin \
Tobias Holmedahl Sandsmark.</div> <div>By David Faure.</div>
<p style="color: grey;"><i>Updated July 7, 2014, 7:17 p.m.</i></p>
<div style="margin-top: 1.5em;">
<b style="color: #575012; font-size: 10pt;">Repository: </b>
khtml
</div>
<h1 style="color: #575012; font-size: 10pt; margin-top: 1.5em;">Description </h1>
<table width="100%" bgcolor="#ffffff" cellspacing="0" cellpadding="10" \
style="border: 1px solid #b8b5a0"> <tr>
<td>
<pre style="margin: 0; padding: 0; white-space: pre-wrap; white-space: \
-moz-pre-wrap; white-space: -pre-wrap; white-space: -o-pre-wrap; word-wrap: \
break-word;"><p style="padding: 0;text-rendering: inherit;margin: 0;line-height: \
inherit;white-space: inherit;">khtml: install kxmlgui .rc files into \
KXMLGUI_INSTALL_DIR (= share/kxmlgui5)</p> <p style="padding: 0;text-rendering: \
inherit;margin: 0;line-height: inherit;white-space: inherit;">This removes the need \
to version the file themselves, so revert that.</p></pre> </td>
</tr>
</table>
<h1 style="color: #575012; font-size: 10pt; margin-top: 1.5em;">Testing </h1>
<table width="100%" bgcolor="#ffffff" cellspacing="0" cellpadding="10" style="border: \
1px solid #b8b5a0"> <tr>
<td>
<pre style="margin: 0; padding: 0; white-space: pre-wrap; white-space: \
-moz-pre-wrap; white-space: -pre-wrap; white-space: -o-pre-wrap; word-wrap: \
break-word;"><p style="padding: 0;text-rendering: inherit;margin: 0;line-height: \
inherit;white-space: inherit;">testkhtml still has menus (even after removing the old \
files)</p></pre> </td>
</tr>
</table>
<h1 style="color: #575012; font-size: 10pt; margin-top: 1.5em;">Diffs</b> </h1>
<ul style="margin-left: 3em; padding-left: 0;">
<li>src/CMakeLists.txt <span style="color: \
grey">(fe4f49e5799f6b8781eebb217c49b9171600e2f3)</span></li>
<li>src/khtml_part.cpp <span style="color: \
grey">(d7dcb92619d1ba69f015b3a48d9b352f40241196)</span></li>
</ul>
<p><a href="https://git.reviewboard.kde.org/r/119164/diff/" style="margin-left: \
3em;">View Diff</a></p>
</td>
</tr>
</table>
</div>
</body>
</html>
--===============5596849410439179562==--
_______________________________________________
Kde-frameworks-devel mailing list
Kde-frameworks-devel@kde.org
https://mail.kde.org/mailman/listinfo/kde-frameworks-devel
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic