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

[Ahumada Sergio]

On 07/15/2013 10:53 AM, Sergio Ahumada wrote:> Hi,
> 
> We are about to start the "Qt 5.1.1" release, which means that:
> 
> - We plan to do a fast-forward merge from 'stable' into 'release' branch
> on Jul 22th.
> 
> - After Jul 22th any changes that are required for 5.1.1 need to be
> pushed to the 'release' branch. So if your changes are not in by that
> day, please wait until the merge is done and re-target them to the
> 'release' branch.
> 
> The repositories that will be part of the Qt 5.1.1 release merge are:
> 
> - qtactiveqt
> - qtbase
> - qtdeclarative
> - qtdoc
> - qtgraphicaleffects
> - qtimageformats
> - qtjsbackend
> - qtmultimedia
> - qtquick1
> - qtquickcontrols
> - qtscript
> - qtsensors
> - qtserialport
> - qtsvg
> - qttools
> - qttranslations
> - qtwebkit
> - qtwebkit-examples
> - qtxmlpatterns
> - qtx11extras
> 
> ps: you can already find some snapshots for 5.1.1 under
> http://download.qt-project.org/snapshots/qt/5.1/5.1.1-rc1/backups/
> 
> Cheers,
> 

Hi,

The merge from 'stable' to 'release' is happening now as we speak.

The plan is the following:

- We will block the "Merge Patch Set X to Staging" button for all the repositories listed above (for the 'stable' branch only).
- We will wait for changes still under test until they are all merged and/or back to Review in Progress.
- We will proceed with the merge for all the repositories listed above.
- We will leave the "Merge Patch Set X to Staging" blocked for around two days, to avoid that changes get merged to the wrong branch and need to be cherry-picked.

If your changes didn't make it and they are meant for Qt 5.1.1 please re-target them to the 'release' branch after the merges are done.

New changes fixing P0 or P1 can be pushed directly to the 'release' branch after the merges are done.

Cheers,
-- 
Sergio Ahumada
san at sansano.inf.utfsm.cl