qt-copy (or kde-qt) patches cleanup

[Albert Astals Cid]

A Dimecres, 30 de setembre de 2009, vàreu escriure:
> Hi,
> 
> So soon, as Tom mailed, Qt 4.6 will be mandatory, to develop in KDE trunk.
> 
> We however still recommend to use a patched version of Qt, namely kde-qt
> (formely qt-copy)
> 
> While I understand the need of this 'fork', I would like to have as few
> patches as possible against Qt.
> The reason is that we (Nokia Qt DF) would like distribution to ship a non-
> patched version of Qt, because this is what we support. So KDE must run
>  fine with the normal Qt
> 
> So i took each patch that are still in the 4.6 branch one by one:
> Some of the author of the patches are in CC of this email, just to be sure
> 
> 
> * 0286-fix-error-string
> http://qt.gitorious.org/+kde-developers/qt/kde-qt/commit/4b5ae1db24fa1b96f0
> 0e
> 
> This is an issue in Webkit,  it should be handled in the Bebkit bugzilla.
> I think a bug has been opened there but i can't find the number.
> 
> Trivial thing anyway.

This is mine, it has been commited or so i was told

http://qt.gitorious.org/qt/qt/merge_requests/778

>  * 0289-context-for-shortcuts-tr
> http://qt.gitorious.org/+kde-developers/qt/kde-qt/commit/9eb3560cfd5cd0bc9c
> 
>  Add context to tr calls in QShortcut
> 
> I haven't seen any merge request on that. Albert, please do one.

I made a merge request, Ossi rejected it and i closed it

> Anyway, as it changes the strings it is too late for Qt 4.6
> 
> We probably can keep it in KDE for Qt 4.6 assuming we do our own
>  translations of Qt.

We do our own translations of Qt, yes, but if the shipped version is not KDE 
one the patch won't work.

> About translations of Qt, this is another point that is not clear to me. Do
> KDE has its own translations of Qt?  

Yes.

> Why the translations doesn't go upstreams?
Two reasons:
 * We use .po translations, you do not.
 * We accept LGPL translations, you do not.

We can discuss about this if you want, it is obvious *you* would benefit 
tremendously from the KDE translators, but i'm not sure we can reach an 
agreement. I'm on IRC so if you feel like chatting, just /query me

Albert