[Releasing] [Development] HEADS UP: merge stable into release and dev into stable

[Heikkinen Jani]

Hi all!

I think we need to get merge done as soon as possible to make branches etc clear for everyone. That's why I propose to
1. Finalize those merges from stable to dev as soon as possible
	https://codereview.qt-project.org/#change,78341
	https://codereview.qt-project.org/#change,78333 (Integrating)
	https://codereview.qt-project.org/#change,77965(Integrating)

2. do the merge from dev to stable tomorrow morning
3. re-target remaining changes related to GL switching, QQuickWidget and the printing patch series to the stable branch

Br,
Jani

> -----Original Message-----
> From: Knoll Lars
> Sent: 17. helmikuuta 2014 14:50
> To: Hausmann Simon; development at qt-project.org
> Cc: Heikkinen Jani; releasing at qt-project.org; Paaso Matti
> Subject: Re: [Development] HEADS UP: merge stable into release and dev
> into stable
> 
> On 17/02/14 13:01, "Simon Hausmann" <simon.hausmann at digia.com>
> wrote:
> 
> >On Monday 17. February 2014 07.16.12 Heikkinen Jani wrote:
> >> Hi all,
> >>
> >> It seems we cannot start merge from dev branch to stable at the
> moment
> >> because there is still some issues to be solved before that:
> >>
> >> 1.      There seems to be compilation break in dev branch, see
> >> https://codereview.qt-project.org/#change,78283. That needs to be
> solved
> >> first
> >
> >This is solved now :)
> >
> >> 2.      There is still some merges ongoing from stable to dev branch
> >>
> >> *        https://codereview.qt-project.org/#change,77965
> >>
> >> *        https://codereview.qt-project.org/#change,77972
> >>
> >> *        https://codereview.qt-project.org/#change,77977
> >>
> >> *        https://codereview.qt-project.org/#change,77258
> >>
> >> 3.      Adding qtwebsockets as a submodule is still ongoing, see
> >> https://codereview.qt-project.org/#change,76844
> >
> >For the sake of coordination, with regards to qtdeclarative:
> >
> >* I have a merge from stable to dev prepared that resolves the conflicts.
> >After
> >that you should be able to do the final merge yourself (should be a fast-
> >forward if any)
> >
> >* However at the same time we have two big pending changes, currently
> >targetted for dev, that we've been trying to integrate over the weekend:
> >  * QtQuickWidget
> >  * Support for GL switching (Dynamic GL patch)
> >
> >So we have three patches that need to go in: The merge, the
> QtQuickWidget
> >changes and the dynamic GL changes. I suggest we try QtQuickWidget and
> >Laszlo's GL changes first, and when those are in, then I'll try to stage
> >the
> >merge.
> >
> >If anyone else has other changes for qtdeclarative, please consider
> >holding
> >back and consider re-targetting to stable after the project branch or
> >speak up
> >:). Staging of unrelated changes will just slow down the process.
> >
> >Otherwise, let's also coordinate in #qt-labs.
> 
> There are also the pending printer changes from John, that is pending.
> 
> As we would like to do the branching to stable as soon as possible, So I¹m
> ok if GL switching, QQuickWidget and the printing patch series get pushed
> to stable after the merge as an exception to the feature freeze. But
> ideally we manage to get at least some of them in before.
> 
> Cheers,
> Lars
> 
> 
> 
>