[Releasing] [Development] HEADS UP: Qt 5.3.0 - merge stable into release

[Thiago Macieira]

Em ter 08 abr 2014, às 05:44:30, Heikkinen Jani escreveu:
> >>I would also like to request that the following be merged into release
> >>
> >>*before* it becomes 5.3:
> >>   https://codereview.qt-project.org/79787
> >>   https://codereview.qt-project.org/79827
> >>
> >>They're both simple documentation fixes, and already approved.
> 
> In my opinion these changes should be moved to stable as John already
> commented. At the moment there is no reason to integrate any changes to
> release branch...
> 
> And like I wrote we are planning to do FF merge from stable to release -> if
> we integrate new changes to release we need first merge release from stable
> (OK, I haven't check this and this might be the case even without these
> changes)

Yes, but it doesn't have to be now. We can merge old/5.2 afterwards, at any 
point before the release.

-- 
Thiago Macieira - thiago.macieira (AT) intel.com
  Software Architect - Intel Open Source Technology Center