[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-frameworks-devel
Subject: Re: Review Request 126618: Make CMake macro kcoreaddons_desktop_to_json() work on windows.
From: Kåre Särs <kare.sars () iki ! fi>
Date: 2016-01-15 22:04:56
Message-ID: 20160115220456.32176.6580 () mimi ! kde ! org
[Download RAW message or body]
--===============7991426739530389392==
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/126618/
-----------------------------------------------------------
(Updated Jan. 15, 2016, 10:04 p.m.)
Review request for KDE Frameworks.
Changes
-------
Use QCoreApplication::applicationDirPath() in stead and modify the error message.
I'm not sure my CMake Fu is up to the task of adding \
${KDE_INSTALL_FULL_KSERVICETYPES5DIR} + path option...
Repository: kcoreaddons
Description
-------
Without this patch kcoreaddons_desktop_to_json() will not find the destop file.
On windows GenericDataLocation returns "C:/Users/<USER>/AppData/Local" or \
"C:/ProgramData". That is not a path that contains any destip files ;)
This patch adds AppLocalDataLocation to the seach if the previous search does not \
return a match.
Another option would be to hardcode the absolute path to all places that uses \
kcoreaddons_desktop_to_json(), but that does not feel too nice...
What other options do we have?
Diffs (updated)
-----
src/lib/plugin/desktopfileparser.cpp 1122af8
Diff: https://git.reviewboard.kde.org/r/126618/diff/
Testing
-------
KTextEditor compiles again on windows
Thanks,
Kåre Särs
--===============7991426739530389392==
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/126618/">https://git.reviewboard.kde.org/r/126618/</a>
</td>
</tr>
</table>
<br />
<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.</div>
<div>By Kåre Särs.</div>
<p style="color: grey;"><i>Updated Jan. 15, 2016, 10:04 p.m.</i></p>
<h1 style="color: #575012; font-size: 10pt; margin-top: 1.5em;">Changes</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;">Use QCoreApplication::applicationDirPath() in stead and modify the error \
message.
I'm not sure my CMake Fu is up to the task of adding \
${KDE_INSTALL_FULL_KSERVICETYPES5DIR} + path option...</pre> </td>
</tr>
</table>
<div style="margin-top: 1.5em;">
<b style="color: #575012; font-size: 10pt;">Repository: </b>
kcoreaddons
</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;">Without this patch kcoreaddons_desktop_to_json() will \
not find the destop file.</p> <p style="padding: 0;text-rendering: inherit;margin: \
0;line-height: inherit;white-space: inherit;">On windows GenericDataLocation returns \
"C:/Users/<USER>/AppData/Local" or "C:/ProgramData". That is not a path that \
contains any destip files ;)</p> <p style="padding: 0;text-rendering: inherit;margin: \
0;line-height: inherit;white-space: inherit;">This patch adds AppLocalDataLocation to \
the seach if the previous search does not return a match. </p> <p style="padding: \
0;text-rendering: inherit;margin: 0;line-height: inherit;white-space: \
inherit;">Another option would be to hardcode the absolute path to all places that \
uses kcoreaddons_desktop_to_json(), but that does not feel too nice...</p> <p \
style="padding: 0;text-rendering: inherit;margin: 0;line-height: inherit;white-space: \
inherit;">What other options do we have?</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;">KTextEditor compiles again on windows</p></pre> </td>
</tr>
</table>
<h1 style="color: #575012; font-size: 10pt; margin-top: 1.5em;">Diffs</b> \
(updated)</h1> <ul style="margin-left: 3em; padding-left: 0;">
<li>src/lib/plugin/desktopfileparser.cpp <span style="color: \
grey">(1122af8)</span></li>
</ul>
<p><a href="https://git.reviewboard.kde.org/r/126618/diff/" style="margin-left: \
3em;">View Diff</a></p>
</td>
</tr>
</table>
</div>
</body>
</html>
--===============7991426739530389392==--
[Attachment #3 (text/plain)]
_______________________________________________
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