<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
<html>
<head>
<meta content="text/html; charset=ISO-8859-1"
http-equiv="Content-Type">
<title></title>
</head>
<body bgcolor="#ffffff" text="#000000">
Am 09.03.2011 22:26, schrieb Wolfgang Rohdewald:
<blockquote cite="mid:201103092226.26601.wolfgang@rohdewald.de"
type="cite">
<meta name="qrichtext" content="1">
<style type="text/css">
p, li { white-space: pre-wrap; }
</style>
<p style="margin: 0px; text-indent: 0px;">Hi,</p>
<p style="margin: 0px; text-indent: 0px;"><br>
</p>
<p style="margin: 0px; text-indent: 0px;">when compiling kdelibs
4.6 on Windows, I get an </p>
<p style="margin: 0px; text-indent: 0px;">error in kinit_win.cpp
at line 110 (I am afraid I deleted it)</p>
<p style="margin: 0px; text-indent: 0px;"><br>
</p>
<p style="margin: 0px; text-indent: 0px;">but the commit in
kdelibs below obviously fixes it. So I</p>
<p style="margin: 0px; text-indent: 0px;">want to backport it to
kdelibs.</p>
<p style="margin: 0px; text-indent: 0px;"><br>
</p>
<p style="margin: 0px; text-indent: 0px;">Would that be OK, and
how would I do it? Like this:</p>
<p style="margin: 0px; text-indent: 0px;"><br>
</p>
<p style="margin: 0px; text-indent: 0px;">git checkout --track
origin/KDE/4.6</p>
<p style="margin: 0px; text-indent: 0px;">git cherry-pick fd16288</p>
<p style="margin: 0px; text-indent: 0px;">git push</p>
<p style="margin: 0px; text-indent: 0px;"><br>
</p>
<p style="margin: 0px; text-indent: 0px;">or would I violate
dozens of rules by doing so?</p>
<p style="margin: 0px; text-indent: 0px;"><br>
</p>
<p style="margin: 0px; text-indent: 0px;"><br>
</p>
<p style="margin: 0px; text-indent: 0px;">i5:~/src/kdelibs.was/kinit$
git show fd16288</p>
<p style="margin: 0px; text-indent: 0px;">commit
fd16288cedadf8ccf469df8a7be296763f5003d8</p>
<p style="margin: 0px; text-indent: 0px;">Author: Patrick Spendrin
<a class="moz-txt-link-rfc2396E" href="mailto:ps_ml@gmx.de"><ps_ml@gmx.de></a></p>
<p style="margin: 0px; text-indent: 0px;">Date: Sun Feb 20
21:39:20 2011 +0100</p>
<p style="margin: 0px; text-indent: 0px;"><br>
</p>
<p style="margin: 0px; text-indent: 0px;"> we need to cast by hand
from wchar to ushort</p>
<p style="margin: 0px; text-indent: 0px;"><br>
</p>
<p style="margin: 0px; text-indent: 0px;">diff --git
a/kinit/kinit_win.cpp b/kinit/kinit_win.cpp</p>
<p style="margin: 0px; text-indent: 0px;">index 17266a4..9c1521a
100644</p>
<p style="margin: 0px; text-indent: 0px;">---
a/kinit/kinit_win.cpp</p>
<p style="margin: 0px; text-indent: 0px;">+++
b/kinit/kinit_win.cpp</p>
<p style="margin: 0px; text-indent: 0px;">@@ -107,7 +107,7 @@
QString toString(PSID sid)</p>
<p style="margin: 0px; text-indent: 0px;"> if
(!ConvertSidToStringSid(sid, &s))</p>
<p style="margin: 0px; text-indent: 0px;"> return QString();</p>
<p style="margin: 0px; text-indent: 0px;"> </p>
<p style="margin: 0px; text-indent: 0px;">- QString result =
QString::fromUtf16(s);</p>
<p style="margin: 0px; text-indent: 0px;">+ QString result =
QString::fromUtf16(reinterpret_cast<ushort*>(s));</p>
<p style="margin: 0px; text-indent: 0px;"> LocalFree(s);</p>
<p style="margin: 0px; text-indent: 0px;"> return result;</p>
<p style="margin: 0px; text-indent: 0px;"> }</p>
<p style="margin: 0px; text-indent: 0px;"><br>
</p>
<p style="margin: 0px; text-indent: 0px;"><br>
</p>
<p style="margin: 0px; text-indent: 0px;">-- </p>
<p style="margin: 0px; text-indent: 0px;">Wolfgang</p>
<pre wrap="">
<fieldset class="mimeAttachmentHeader"></fieldset>
_______________________________________________
Kde-windows mailing list
<a class="moz-txt-link-abbreviated" href="mailto:Kde-windows@kde.org">Kde-windows@kde.org</a>
<a class="moz-txt-link-freetext" href="https://mail.kde.org/mailman/listinfo/kde-windows">https://mail.kde.org/mailman/listinfo/kde-windows</a>
</pre>
</blockquote>
<br>
</body>
</html>