[Development] Qt Release and bugfix

[Jani Heikkinen]

> -----Original Message-----
> From: Development <development-bounces at qt-project.org> On Behalf Of
> Fausto Papandrea
> Sent: keskiviikko 18. syyskuuta 2019 13.39
> To: development at qt-project.org
> Subject: [Development] Qt Release and bugfix
> 
> Good morning,
> 
> I have to update my Qt version because of this bug
> https://bugreports.qt.io/browse/QTBUG-74076.
> 
> The bug is marked as resolved in Qt 5.12.4, but, is it merged in Qt 5.13/5.13.1?

Yes, fix was initially integrated in '5.12' and '5.12' is merged to '5.13' from where it is then went in Qt 5.13.0 and future releases

> 
> What's the strategy of the release and bugfix merging?

At that tíme '5.12' was the stable one and by default all fixes should be integrated in that branch. 

So merges went 5.12 -> 5.13 -> dev. And in case of release branch exists those are merged back to feature branch (meaning 5.12.x -> 5.12 and 5.13.x -> 5.13).

At the beginning of September '5.12' was moved to cherry-pick mode meaning no more merges from 5.12 -> 5.13. So from now on merges are:

5.13 -> 5.14 -> 5.15 -> dev + possible merges from release branch to feature branch (5.12.x -> 5.12 and so on)

br,
Jani