[kdelibs/frameworks] kdeui/tests: Remove QEXPECT_FAIL for MR 43915
David Faure
faure at kde.org
Sun Jan 13 12:48:55 UTC 2013
On Sunday 13 January 2013 13:27:23 Jon Severinsson wrote:
> söndagen den 13 januari 2013 13:12:09 skrev du:
> > On Sunday 13 January 2013 13:01:32 Jon Severinsson wrote:
> > > Git commit 02fe875f9f9eb09fcf7da2c2223f733b497ed2ba by Jon Severinsson.
> > > Committed on 13/01/2013 at 11:22.
> > > Pushed by jonseverinsson into branch 'frameworks'.
> > >
> > > Remove QEXPECT_FAIL for MR 43915
> > >
> > > The Qt merge request is now in both the stable and release branches, and
> > > will be part of Qt 5.0.1
> >
> > It's not yet merged to "dev" (=5.1) though.
>
> Upstream seems to be ignoring "dev" and "stable" atm. The qt release team
> have done some stable -> release merges in preparation for Qt 5.0.1, but
> the automatic forward merges (release -> stable and stable -> dev)
> prommised in the original Qt 5 branching plan is apparently not up and
> running yet, so if you want to run anything but release you'll have to do
> that yourself, or miss all release critical fixes (for stable) or all fixes
> (for dev).
Not really true:
commit 63f24f6ba8417e90294a1a90d01a3c3de80b7af4
Merge: ae2359d 0565922
Author: Sergio Ahumada <sergio.ahumada at digia.com>
Date: Wed Jan 9 11:49:43 2013 +0100
Merge branch 'stable' into dev
It's just that this missed your fix, which will have to be in the next merge.
The additional issue is that qt5.git doesn't even have the above merge yet,
because of a sqlite.h issue in qtwebkit, see https://codereview.qt-
project.org/43778 -- which I won't have time to debug next week.
--
David Faure, faure at kde.org, http://www.davidfaure.fr
Working on KDE, in particular KDE Frameworks 5
More information about the Kde-frameworks-devel
mailing list