Hotfix for KWallet in the Frameworks 5.22.0 Release

[Allen Winter]

On Monday, May 09, 2016 02:28:16 PM laurent Montel wrote:
> Le lundi 9 mai 2016, 10:59:24 CEST Harald Sitter a écrit :
> > On Sun, May 8, 2016 at 11:29 PM, Allen Winter <winter at kde.org> wrote:
> > > Howdy,
> > > 
> > > Unfortunately my commit b3a95ba0540e01a9bb10db53fc449cc49ce9a9e8 for
> > > the blowfish backend in kwallet broke things.
> > > 
> > > See https://bugs.kde.org/show_bug.cgi?id=362805
> > > 
> > > A patch can be found attached to that bug, or you can get commit
> > > 87e774825b779ba846315a8b2ffe6479dd9f9814 from frameworks kwallet repo.
> > 
> > There may be more trouble afoot as we debugged a problem in neon today
> > that turned out to be probably caused by
> > 87e774825b779ba846315a8b2ffe6479dd9f9814 and went away when rolling
> > back to a build of 15e6febac44810b1ee640ffd73cd3ef7d6360527
> > 
> > https://bugs.kde.org/show_bug.cgi?id=362842
> 
> Same for me It was necessary to revert to 
> 15e6febac44810b1ee640ffd73cd3ef7d6360527
> 
> Even with last master it doesn't work.
> For me it will better to revert to 15e6febac44810b1ee640ffd73cd3ef7d6360527 
> and release it until we understand why it's broken with this 2 last patchs.
> 
Done.
I reverted both in commit 0d56c68d7a2204a987a5255096d004d5a696c0e5
I also added a big comment not to include qglobal.h so we let the compiler 
do what ever it might do when it encounters an undefined macro.. not good.