On Sunday 13 January 2013 13:27:23 Jon Severinsson wrote: > 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).
On Sunday 13 January 2013 13:48:55 David Faure wrote: > Not really true: > > commit 63f24f6ba8417e90294a1a90d01a3c3de80b7af4 > Merge: ae2359d 0565922 > Author: Sergio Ahumada <sergio.ahum...@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. OK, I only noticed the lack of merges from release to stable, and assumed stable to dev was the same... On Sunday 13 January 2013 13:54:06 David Faure wrote: > Soon we'll be using API that's only in dev, BTW. I was under the impression that dropping Qt4 support was in favour of Qt5 released tarballs, eg that we would support both latest 5.0.x and 5.1-git (currently dev, eventually stable) for a while (ie until 5.1.0-rc1). I'm currently running stable with manual merges from release btw. > So I asked that build.kde.org tracks dev. Sounds reasonable for the mid term (once dev starts accepting 5.2 features it should probably track stable instead), but for now it should preferably track some private tree in which you manually merge the release (and stable) submodule heads that are referenced in qt5.git. If that is too much work, just let this one slide... > So this commit resulted in > http://build.kde.org/job/kdelibs_frameworks_qt5/318/testReport/junit/(root) > /TestSuite/kdeui_ktoolbar_unittest/ Not optimal, but since we know the reason for it, and that the solution is on it's way, I think we can live with that for the time being. Regards Jon Severinsson
signature.asc
Description: This is a digitally signed message part.
_______________________________________________ Kde-frameworks-devel mailing list Kde-frameworks-devel@kde.org https://mail.kde.org/mailman/listinfo/kde-frameworks-devel
