Re: Problem merging Qt branch

2013-08-21 Thread David Edmundson
Thanks to awesome help from David F and Kevin this all got resolved. Thanks guys. David ___ Kde-frameworks-devel mailing list Kde-frameworks-devel@kde.org https://mail.kde.org/mailman/listinfo/kde-frameworks-devel

Re: Problem merging Qt branch

2013-08-20 Thread Kevin Ottens
On Monday 19 August 2013 22:30:21 David Edmundson wrote: > Hey, > > I don't think I'll be able to make the meeting tomorrow, which is a shame > as I'm currently stuck. > > I have a Qt review. It all passed, everyone is happy: > https://codereview.qt-project.org/#change,62059 > > however every ti

Problem merging Qt branch

2013-08-20 Thread David Edmundson
Hey, I don't think I'll be able to make the meeting tomorrow, which is a shame as I'm currently stuck. I have a Qt review. It all passed, everyone is happy: https://codereview.qt-project.org/#change,62059 however every time it goes through integration testing, because I've modified QEvent, it ru